@danielx/civet 0.5.63 → 0.5.64

package/dist/browser.js

@@ -501,6 +501,7 @@ ${input.slice(result.pos)}
         CallExpression,
         CallExpressionRest,
         OptionalShorthand,
+        OptionalDot,
         NonNullAssertion,
         MemberExpression,
         MemberExpressionRest,
@@ -3314,7 +3315,7 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var OptionalShorthand$0 = $TS($S(QuestionMark, $C(Dot, InsertDot)), function($skip, $loc, $0, $1, $2) {
+      var OptionalShorthand$0 = $TS($S(QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2) {
         return {
           type: "Optional",
           children: $0
@@ -3342,6 +3343,30 @@ ${input.slice(result.pos)}
           return result;
         }
       }
+      var OptionalDot$0 = Dot;
+      var OptionalDot$1 = InsertDot;
+      function OptionalDot(state) {
+        let eventData;
+        if (state.events) {
+          const result = state.events.enter?.("OptionalDot", state);
+          if (result) {
+            if (result.cache)
+              return result.cache;
+            eventData = result.data;
+          }
+        }
+        if (state.tokenize) {
+          const result = $TOKEN("OptionalDot", state, OptionalDot$0(state) || OptionalDot$1(state));
+          if (state.events)
+            state.events.exit?.("OptionalDot", state, result, eventData);
+          return result;
+        } else {
+          const result = OptionalDot$0(state) || OptionalDot$1(state);
+          if (state.events)
+            state.events.exit?.("OptionalDot", state, result, eventData);
+          return result;
+        }
+      }
       var NonNullAssertion$0 = $T($EXPECT($L14, fail, 'NonNullAssertion "!"'), function(value) {
         return { "type": "NonNullAssertion", "ts": true, "children": value };
       });
@@ -3622,11 +3647,11 @@ ${input.slice(result.pos)}
           return result;
         }
       }
-      var PropertyGlob$0 = $TS($S(Dot, ObjectBindingPattern), function($skip, $loc, $0, $1, $2) {
-        var pattern = $2;
+      var PropertyGlob$0 = $TS($S(OptionalDot, BracedObjectLiteral), function($skip, $loc, $0, $1, $2) {
+        var object = $2;
         return {
           type: "PropertyGlob",
-          pattern,
+          object,
           children: $0
         };
       });
@@ -5168,7 +5193,7 @@ ${input.slice(result.pos)}
           block
         };
       });
-      var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), Ampersand, $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
+      var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), $C(Ampersand, $S($N(NumericLiteral), $Y($S($E(QuestionMark), Dot)))), $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
         var prefix = $1;
         var rhs = $3;
         if (!prefix && !rhs)
@@ -6652,6 +6677,7 @@ ${input.slice(result.pos)}
           const children = [open, ...content, close];
           return {
             type: "ObjectExpression",
+            content,
             children,
             names: children.flatMap((c) => {
               return c.names || [];
@@ -6981,7 +7007,7 @@ ${input.slice(result.pos)}
         const value = [{ ...at, token: "this." }, id];
         return {
           type: "Property",
-          children: [...ws, id, ": ", ...value],
+          children: [ws, id, ": ", ...value],
           name: id,
           names: id.names,
           value
@@ -6992,7 +7018,7 @@ ${input.slice(result.pos)}
         var prop = $2;
         return {
           ...prop,
-          children: [...ws, ...prop.children]
+          children: [ws, ...prop.children]
         };
       });
       var PropertyDefinition$2 = $TS($S(__, $TEXT($EXPECT($R5, fail, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
@@ -7002,7 +7028,7 @@ ${input.slice(result.pos)}
         const value = toggle === "+" ? "true" : "false";
         return {
           type: "Property",
-          children: [...ws, id, ": ", value],
+          children: [ws, id, ": ", value],
           name: id,
           names: id.names,
           value
@@ -7015,7 +7041,7 @@ ${input.slice(result.pos)}
           return $skip;
         return {
           ...def,
-          children: [...ws, ...def.children]
+          children: [ws, ...def.children]
         };
       });
       var PropertyDefinition$4 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
@@ -7024,7 +7050,7 @@ ${input.slice(result.pos)}
         var exp = $3;
         return {
           type: "SpreadProperty",
-          children: [...ws, dots, exp],
+          children: [ws, dots, exp],
           names: exp.names,
           value: [dots, exp]
         };
@@ -7033,7 +7059,7 @@ ${input.slice(result.pos)}
         var ws = $1;
         var value = $2;
         if (value.type === "Identifier") {
-          return { ...value, children: [...ws, ...value.children] };
+          return { ...value, children: [ws, ...value.children] };
         }
         let exp = value, children, i;
         do {
@@ -7278,9 +7304,9 @@ ${input.slice(result.pos)}
           ts: true
         };
       });
-      var MethodDefinition$1 = $TS($S(MethodSignature, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2) {
+      var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
         var signature = $1;
-        var block = $2;
+        var block = $3;
         return {
           type: "MethodDefinition",
           children: $0,
@@ -18570,19 +18596,20 @@ ${input.slice(result.pos)}
             if (glob?.type === "PropertyGlob") {
               const prefix = children.slice(0, i).concat(glob.children[0]);
               const parts = [];
-              for (const part of glob.pattern.content) {
-                if (part.init) {
-                  throw new Error("Glob pattern cannot have initializers");
+              for (const part of glob.object.content) {
+                if (part.type === "SpreadProperty") {
+                  throw new Error("Glob pattern cannot have ...spread property");
                 }
-                if (part.type === "AtBindingProperty") {
-                  throw new Error("Glob pattern cannot have @property");
+                if (part.type === "MethodDefinition") {
+                  throw new Error("Glob pattern cannot have method definition");
                 }
-                if (part.type === "BindingRestProperty") {
-                  throw new Error("Glob pattern cannot have ...rest property");
+                if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
+                  throw new Error("Glob pattern must have call or member expression value");
                 }
-                const name = part.value ? module.insertTrimmingSpace(part.value, "") : part.name;
-                const value = prefix.concat(module.insertTrimmingSpace(part.name, ""));
-                const wValue = part.value && module.getTrimmingSpace(part.value);
+                const { name } = part;
+                let value = part.value ?? part.name;
+                const wValue = module.getTrimmingSpace(part.value);
+                value = prefix.concat(module.insertTrimmingSpace(value, ""));
                 if (wValue)
                   value.unshift(wValue);
                 parts.push({
@@ -18603,10 +18630,9 @@ ${input.slice(result.pos)}
               const object = {
                 type: "ObjectExpression",
                 children: [
-                  glob.pattern.children[0],
+                  glob.object.children[0],
                   ...parts,
-                  glob.pattern.children.at(-2),
-                  glob.pattern.children.at(-1)
+                  glob.object.children.at(-1)
                 ]
               };
               if (i === children.length - 1)

package/dist/main.js

@@ -500,6 +500,7 @@ ${input.slice(result.pos)}
       CallExpression,
       CallExpressionRest,
       OptionalShorthand,
+      OptionalDot,
       NonNullAssertion,
       MemberExpression,
       MemberExpressionRest,
@@ -3313,7 +3314,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OptionalShorthand$0 = $TS($S(QuestionMark, $C(Dot, InsertDot)), function($skip, $loc, $0, $1, $2) {
+    var OptionalShorthand$0 = $TS($S(QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2) {
       return {
         type: "Optional",
         children: $0
@@ -3341,6 +3342,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var OptionalDot$0 = Dot;
+    var OptionalDot$1 = InsertDot;
+    function OptionalDot(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("OptionalDot", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("OptionalDot", state, OptionalDot$0(state) || OptionalDot$1(state));
+        if (state.events)
+          state.events.exit?.("OptionalDot", state, result, eventData);
+        return result;
+      } else {
+        const result = OptionalDot$0(state) || OptionalDot$1(state);
+        if (state.events)
+          state.events.exit?.("OptionalDot", state, result, eventData);
+        return result;
+      }
+    }
     var NonNullAssertion$0 = $T($EXPECT($L14, fail, 'NonNullAssertion "!"'), function(value) {
       return { "type": "NonNullAssertion", "ts": true, "children": value };
     });
@@ -3621,11 +3646,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PropertyGlob$0 = $TS($S(Dot, ObjectBindingPattern), function($skip, $loc, $0, $1, $2) {
-      var pattern = $2;
+    var PropertyGlob$0 = $TS($S(OptionalDot, BracedObjectLiteral), function($skip, $loc, $0, $1, $2) {
+      var object = $2;
       return {
         type: "PropertyGlob",
-        pattern,
+        object,
         children: $0
       };
     });
@@ -5167,7 +5192,7 @@ ${input.slice(result.pos)}
         block
       };
     });
-    var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), Ampersand, $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
+    var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), $C(Ampersand, $S($N(NumericLiteral), $Y($S($E(QuestionMark), Dot)))), $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
       var prefix = $1;
       var rhs = $3;
       if (!prefix && !rhs)
@@ -6651,6 +6676,7 @@ ${input.slice(result.pos)}
         const children = [open, ...content, close];
         return {
           type: "ObjectExpression",
+          content,
           children,
           names: children.flatMap((c) => {
             return c.names || [];
@@ -6980,7 +7006,7 @@ ${input.slice(result.pos)}
       const value = [{ ...at, token: "this." }, id];
       return {
         type: "Property",
-        children: [...ws, id, ": ", ...value],
+        children: [ws, id, ": ", ...value],
         name: id,
         names: id.names,
         value
@@ -6991,7 +7017,7 @@ ${input.slice(result.pos)}
       var prop = $2;
       return {
         ...prop,
-        children: [...ws, ...prop.children]
+        children: [ws, ...prop.children]
       };
     });
     var PropertyDefinition$2 = $TS($S(__, $TEXT($EXPECT($R5, fail, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
@@ -7001,7 +7027,7 @@ ${input.slice(result.pos)}
       const value = toggle === "+" ? "true" : "false";
       return {
         type: "Property",
-        children: [...ws, id, ": ", value],
+        children: [ws, id, ": ", value],
         name: id,
         names: id.names,
         value
@@ -7014,7 +7040,7 @@ ${input.slice(result.pos)}
         return $skip;
       return {
         ...def,
-        children: [...ws, ...def.children]
+        children: [ws, ...def.children]
       };
     });
     var PropertyDefinition$4 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
@@ -7023,7 +7049,7 @@ ${input.slice(result.pos)}
       var exp = $3;
       return {
         type: "SpreadProperty",
-        children: [...ws, dots, exp],
+        children: [ws, dots, exp],
         names: exp.names,
         value: [dots, exp]
       };
@@ -7032,7 +7058,7 @@ ${input.slice(result.pos)}
       var ws = $1;
       var value = $2;
       if (value.type === "Identifier") {
-        return { ...value, children: [...ws, ...value.children] };
+        return { ...value, children: [ws, ...value.children] };
       }
       let exp = value, children, i;
       do {
@@ -7277,9 +7303,9 @@ ${input.slice(result.pos)}
         ts: true
       };
     });
-    var MethodDefinition$1 = $TS($S(MethodSignature, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2) {
+    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
       var signature = $1;
-      var block = $2;
+      var block = $3;
       return {
         type: "MethodDefinition",
         children: $0,
@@ -18569,19 +18595,20 @@ ${input.slice(result.pos)}
           if (glob?.type === "PropertyGlob") {
             const prefix = children.slice(0, i).concat(glob.children[0]);
             const parts = [];
-            for (const part of glob.pattern.content) {
-              if (part.init) {
-                throw new Error("Glob pattern cannot have initializers");
+            for (const part of glob.object.content) {
+              if (part.type === "SpreadProperty") {
+                throw new Error("Glob pattern cannot have ...spread property");
               }
-              if (part.type === "AtBindingProperty") {
-                throw new Error("Glob pattern cannot have @property");
+              if (part.type === "MethodDefinition") {
+                throw new Error("Glob pattern cannot have method definition");
               }
-              if (part.type === "BindingRestProperty") {
-                throw new Error("Glob pattern cannot have ...rest property");
+              if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
+                throw new Error("Glob pattern must have call or member expression value");
               }
-              const name = part.value ? module2.insertTrimmingSpace(part.value, "") : part.name;
-              const value = prefix.concat(module2.insertTrimmingSpace(part.name, ""));
-              const wValue = part.value && module2.getTrimmingSpace(part.value);
+              const { name } = part;
+              let value = part.value ?? part.name;
+              const wValue = module2.getTrimmingSpace(part.value);
+              value = prefix.concat(module2.insertTrimmingSpace(value, ""));
               if (wValue)
                 value.unshift(wValue);
               parts.push({
@@ -18602,10 +18629,9 @@ ${input.slice(result.pos)}
             const object = {
               type: "ObjectExpression",
               children: [
-                glob.pattern.children[0],
+                glob.object.children[0],
                 ...parts,
-                glob.pattern.children.at(-2),
-                glob.pattern.children.at(-1)
+                glob.object.children.at(-1)
               ]
             };
             if (i === children.length - 1)

package/dist/main.mjs

@@ -498,6 +498,7 @@ ${input.slice(result.pos)}
       CallExpression,
       CallExpressionRest,
       OptionalShorthand,
+      OptionalDot,
       NonNullAssertion,
       MemberExpression,
       MemberExpressionRest,
@@ -3311,7 +3312,7 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var OptionalShorthand$0 = $TS($S(QuestionMark, $C(Dot, InsertDot)), function($skip, $loc, $0, $1, $2) {
+    var OptionalShorthand$0 = $TS($S(QuestionMark, OptionalDot), function($skip, $loc, $0, $1, $2) {
       return {
         type: "Optional",
         children: $0
@@ -3339,6 +3340,30 @@ ${input.slice(result.pos)}
         return result;
       }
     }
+    var OptionalDot$0 = Dot;
+    var OptionalDot$1 = InsertDot;
+    function OptionalDot(state) {
+      let eventData;
+      if (state.events) {
+        const result = state.events.enter?.("OptionalDot", state);
+        if (result) {
+          if (result.cache)
+            return result.cache;
+          eventData = result.data;
+        }
+      }
+      if (state.tokenize) {
+        const result = $TOKEN("OptionalDot", state, OptionalDot$0(state) || OptionalDot$1(state));
+        if (state.events)
+          state.events.exit?.("OptionalDot", state, result, eventData);
+        return result;
+      } else {
+        const result = OptionalDot$0(state) || OptionalDot$1(state);
+        if (state.events)
+          state.events.exit?.("OptionalDot", state, result, eventData);
+        return result;
+      }
+    }
     var NonNullAssertion$0 = $T($EXPECT($L14, fail, 'NonNullAssertion "!"'), function(value) {
       return { "type": "NonNullAssertion", "ts": true, "children": value };
     });
@@ -3619,11 +3644,11 @@ ${input.slice(result.pos)}
         return result;
       }
     }
-    var PropertyGlob$0 = $TS($S(Dot, ObjectBindingPattern), function($skip, $loc, $0, $1, $2) {
-      var pattern = $2;
+    var PropertyGlob$0 = $TS($S(OptionalDot, BracedObjectLiteral), function($skip, $loc, $0, $1, $2) {
+      var object = $2;
       return {
         type: "PropertyGlob",
-        pattern,
+        object,
         children: $0
       };
     });
@@ -5165,7 +5190,7 @@ ${input.slice(result.pos)}
         block
       };
     });
-    var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), Ampersand, $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
+    var FunctionExpression$1 = $TS($S($E(AmpersandUnaryPrefix), $C(Ampersand, $S($N(NumericLiteral), $Y($S($E(QuestionMark), Dot)))), $E(AmpersandBlockRHS)), function($skip, $loc, $0, $1, $2, $3) {
       var prefix = $1;
       var rhs = $3;
       if (!prefix && !rhs)
@@ -6649,6 +6674,7 @@ ${input.slice(result.pos)}
         const children = [open, ...content, close];
         return {
           type: "ObjectExpression",
+          content,
           children,
           names: children.flatMap((c) => {
             return c.names || [];
@@ -6978,7 +7004,7 @@ ${input.slice(result.pos)}
       const value = [{ ...at, token: "this." }, id];
       return {
         type: "Property",
-        children: [...ws, id, ": ", ...value],
+        children: [ws, id, ": ", ...value],
         name: id,
         names: id.names,
         value
@@ -6989,7 +7015,7 @@ ${input.slice(result.pos)}
       var prop = $2;
       return {
         ...prop,
-        children: [...ws, ...prop.children]
+        children: [ws, ...prop.children]
       };
     });
     var PropertyDefinition$2 = $TS($S(__, $TEXT($EXPECT($R5, fail, "PropertyDefinition /[!+-]/")), PropertyName), function($skip, $loc, $0, $1, $2, $3) {
@@ -6999,7 +7025,7 @@ ${input.slice(result.pos)}
       const value = toggle === "+" ? "true" : "false";
       return {
         type: "Property",
-        children: [...ws, id, ": ", value],
+        children: [ws, id, ": ", value],
         name: id,
         names: id.names,
         value
@@ -7012,7 +7038,7 @@ ${input.slice(result.pos)}
         return $skip;
       return {
         ...def,
-        children: [...ws, ...def.children]
+        children: [ws, ...def.children]
       };
     });
     var PropertyDefinition$4 = $TS($S(__, DotDotDot, ExtendedExpression), function($skip, $loc, $0, $1, $2, $3) {
@@ -7021,7 +7047,7 @@ ${input.slice(result.pos)}
       var exp = $3;
       return {
         type: "SpreadProperty",
-        children: [...ws, dots, exp],
+        children: [ws, dots, exp],
         names: exp.names,
         value: [dots, exp]
       };
@@ -7030,7 +7056,7 @@ ${input.slice(result.pos)}
       var ws = $1;
       var value = $2;
       if (value.type === "Identifier") {
-        return { ...value, children: [...ws, ...value.children] };
+        return { ...value, children: [ws, ...value.children] };
       }
       let exp = value, children, i;
       do {
@@ -7275,9 +7301,9 @@ ${input.slice(result.pos)}
         ts: true
       };
     });
-    var MethodDefinition$1 = $TS($S(MethodSignature, BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2) {
+    var MethodDefinition$1 = $TS($S(MethodSignature, $N(PropertyAccess), BracedOrEmptyBlock), function($skip, $loc, $0, $1, $2, $3) {
       var signature = $1;
-      var block = $2;
+      var block = $3;
       return {
         type: "MethodDefinition",
         children: $0,
@@ -18567,19 +18593,20 @@ ${input.slice(result.pos)}
           if (glob?.type === "PropertyGlob") {
             const prefix = children.slice(0, i).concat(glob.children[0]);
             const parts = [];
-            for (const part of glob.pattern.content) {
-              if (part.init) {
-                throw new Error("Glob pattern cannot have initializers");
+            for (const part of glob.object.content) {
+              if (part.type === "SpreadProperty") {
+                throw new Error("Glob pattern cannot have ...spread property");
               }
-              if (part.type === "AtBindingProperty") {
-                throw new Error("Glob pattern cannot have @property");
+              if (part.type === "MethodDefinition") {
+                throw new Error("Glob pattern cannot have method definition");
               }
-              if (part.type === "BindingRestProperty") {
-                throw new Error("Glob pattern cannot have ...rest property");
+              if (part.value && !["CallExpression", "MemberExpression", "Identifier"].includes(part.value.type)) {
+                throw new Error("Glob pattern must have call or member expression value");
               }
-              const name = part.value ? module.insertTrimmingSpace(part.value, "") : part.name;
-              const value = prefix.concat(module.insertTrimmingSpace(part.name, ""));
-              const wValue = part.value && module.getTrimmingSpace(part.value);
+              const { name } = part;
+              let value = part.value ?? part.name;
+              const wValue = module.getTrimmingSpace(part.value);
+              value = prefix.concat(module.insertTrimmingSpace(value, ""));
               if (wValue)
                 value.unshift(wValue);
               parts.push({
@@ -18600,10 +18627,9 @@ ${input.slice(result.pos)}
             const object = {
               type: "ObjectExpression",
               children: [
-                glob.pattern.children[0],
+                glob.object.children[0],
                 ...parts,
-                glob.pattern.children.at(-2),
-                glob.pattern.children.at(-1)
+                glob.object.children.at(-1)
               ]
             };
             if (i === children.length - 1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danielx/civet",
-  "version": "0.5.63",
+  "version": "0.5.64",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",