@danielx/civet 0.8.12 → 0.8.13

package/CHANGELOG.md

@@ -4,6 +4,16 @@ This changelog is generated automatically by [`build/changelog.civet`](build/cha
 For each version of Civet, it lists and links to all incorporated PRs,
 as well as a full diff and commit list.
 
+## 0.8.13 (2024-11-05, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.12...v0.8.13), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.13))
+* Playground copy button for large text fragments [[#1569](https://github.com/DanielXMoore/Civet/pull/1569)]
+* Fix unplugin `typecheck`: source mapping and `rewriteCivetImports` combination [[#1571](https://github.com/DanielXMoore/Civet/pull/1571)]
+* Playground buttons to copy input or output [[#1572](https://github.com/DanielXMoore/Civet/pull/1572)]
+* Fix modulo access with placeholders: `x[& %]` [[#1573](https://github.com/DanielXMoore/Civet/pull/1573)]
+* Fix parenthesized `&` followed by type postfix [[#1574](https://github.com/DanielXMoore/Civet/pull/1574)]
+* Playground TypeScript toggle [[#1577](https://github.com/DanielXMoore/Civet/pull/1577)]
+* Fix parenthesized `&` followed by binary op [[#1576](https://github.com/DanielXMoore/Civet/pull/1576)]
+* Object and array literals via `{}` and `[]` followed by items [[#1575](https://github.com/DanielXMoore/Civet/pull/1575)]
+
 ## 0.8.12 (2024-11-03, [diff](https://github.com/DanielXMoore/Civet/compare/v0.8.11...v0.8.12), [commits](https://github.com/DanielXMoore/Civet/commits/v0.8.12))
 * Fix REPL support for `ref`s created by Civet [[#1553](https://github.com/DanielXMoore/Civet/pull/1553)]
 * `array[i%]` modulo index shorthand [[#1554](https://github.com/DanielXMoore/Civet/pull/1554)]

package/dist/browser.js

@@ -1873,8 +1873,8 @@ ${body}`;
         ts(": <T>(object: T, prop: PropertyKey) => boolean"),
         " = ({}.constructor",
         asAny,
-        ").hasOwn;\n"
-      ]]);
+        ").hasOwn"
+      ], ";\n"]);
     },
     is(isRef) {
       state.prelude.push(["", [
@@ -1883,9 +1883,8 @@ ${body}`;
         isRef,
         ts(": { <B, A extends B> (a: A, b: B): b is A, <A, B> (a: A, b: B): a is A & B }"),
         " = Object.is",
-        asAny,
-        ";\n"
-      ]]);
+        asAny
+      ], ";\n"]);
     },
     /**
      * Array length check with type guard.
@@ -1903,8 +1902,11 @@ ${body}`;
     },
     rslice(rsliceRef) {
       const RSliceable = makeRef("RSliceable");
+      state.prelude.push([
+        "",
+        ts(["type ", RSliceable, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"])
+      ]);
       state.prelude.push(["", [
-        ts(["type ", RSliceable, "<R> = string | {length: number; slice(start: number, end: number): {reverse(): R}}\n"]),
         preludeVar,
         rsliceRef,
         ts([": <R, T extends string | ", RSliceable, "<R>>(a: T, start?: number, end?: number) => T extends string ? string : T extends ", RSliceable, "<infer R> ? R : never"]),
@@ -1923,8 +1925,8 @@ ${body}`;
         "  } else {\n",
         "    return a.slice(end, start + 1).reverse()\n",
         "  }\n",
-        "});\n"
-      ]]);
+        "})"
+      ], ";\n"]);
     },
     div(divRef) {
       state.prelude.push(["", [
@@ -1932,8 +1934,8 @@ ${body}`;
         preludeVar,
         divRef,
         ts(": (a: number, b: number) => number"),
-        " = (a, b) => Math.floor(a / b);\n"
-      ]]);
+        " = (a, b) => Math.floor(a / b)"
+      ], ";\n"]);
     },
     modulo(moduloRef) {
       state.prelude.push(["", [
@@ -1941,14 +1943,15 @@ ${body}`;
         preludeVar,
         moduloRef,
         ts(": (a: number, b: number) => number"),
-        " = (a, b) => (a % b + b) % b;\n"
-      ]]);
+        " = (a, b) => (a % b + b) % b"
+      ], ";\n"]);
     },
     Falsy(FalsyRef) {
       state.prelude.push([
         "",
         // [indent, statement]
-        ts(["type ", FalsyRef, " = false | 0 | '' | 0n | null | undefined;\n"])
+        ts(["type ", FalsyRef, " = false | 0 | '' | 0n | null | undefined"]),
+        ";\n"
       ]);
     },
     xor(xorRef) {
@@ -1969,9 +1972,8 @@ ${body}`;
           " extends never ? never : A))"
         ]),
         " = (a, b) => (a ? !b && a : b)",
-        asAny,
-        ";\n"
-      ]]);
+        asAny
+      ], ";\n"]);
     },
     xnor(xnorRef) {
       const Falsy = getHelperRef("Falsy");
@@ -1989,9 +1991,8 @@ ${body}`;
           " ? never : B))"
         ]),
         " = (a, b) => (a ? b : !b || a)",
-        asAny,
-        ";\n"
-      ]]);
+        asAny
+      ], ";\n"]);
     },
     concatAssign(ref) {
       state.prelude.push(["", [
@@ -2009,8 +2010,8 @@ ${body}`;
         asAny,
         ") : (lhs",
         asAny,
-        ").push(rhs), lhs);\n"
-      ]]);
+        ").push(rhs), lhs)"
+      ], ";\n"]);
     },
     AutoPromise(ref) {
       state.prelude.push([
@@ -4718,7 +4719,7 @@ ${js}`
       const simple = ref === expression;
       let children;
       if (simple) {
-        ref = insertTrimmingSpace(ref, "");
+        ref = trimFirstSpace(ref);
         children = [ref];
       } else {
         children = [ref, initializer];
@@ -4908,9 +4909,12 @@ ${js}`
   }
   function dynamizeFromClause(from) {
     from = from.slice(1);
-    from = insertTrimmingSpace(from, "");
-    if (from[from.length - 1]?.type === "ImportAssertion") {
-      const assert2 = from.pop();
+    from = trimFirstSpace(from);
+    let ref2;
+    if (ref2 = from[from.length - 1]?.assertion) {
+      const assert2 = ref2;
+      let ref3;
+      ref3 = from[from.length - 1], ref3.children = ref3.children.filter((a2) => a2 !== assert2);
       from.push(", {", assert2.keyword, ":", assert2.object, "}");
     }
     return ["(", ...from, ")"];
@@ -4919,20 +4923,20 @@ ${js}`
     const { imports } = decl;
     let { star, binding, specifiers } = imports;
     const justDefault = binding && !specifiers && !star;
-    let ref2;
+    let ref4;
     {
       if (binding) {
         if (specifiers) {
-          ref2 = makeRef();
+          ref4 = makeRef();
         } else {
-          ref2 = binding;
+          ref4 = binding;
         }
       } else {
-        ref2 = convertNamedImportsToObject(imports, true);
+        ref4 = convertNamedImportsToObject(imports, true);
       }
     }
     ;
-    const pattern = ref2;
+    const pattern = ref4;
     const c = "const";
     const expression = [
       justDefault ? "(" : void 0,
@@ -5009,7 +5013,7 @@ ${js}`
         { type: "Await", children: "await" },
         " ",
         imp,
-        insertTrimmingSpace(ws2, ""),
+        trimFirstSpace(ws2),
         dynamizeFromClause(from),
         {
           type: "PropertyGlob",
@@ -6660,19 +6664,23 @@ ${js}`
         assert.notEqual(i, 0, "Index access must be preceded by an expression");
         const prefix = i === 1 ? children[0] : children.slice(0, i);
         const { ref, refAssignment } = maybeRefAssignment(prefix);
+        const args = [
+          glob.children.slice(0 + 1, -1),
+          // between "[" and "]" tokens
+          ",",
+          [" ", ref, ".length"]
+        ];
         const call = makeNode({
           type: "CallExpression",
+          implicit: true,
           children: [
             getHelperRef("modulo"),
             makeNode({
               type: "Call",
+              args,
               children: [
                 "(",
-                ...glob.children.slice(0 + 1, -1),
-                // between "[" and "]" tokens
-                ", ",
-                ref,
-                ".length",
+                args,
                 ")"
               ]
             })
@@ -6684,7 +6692,7 @@ ${js}`
           ...node,
           children: [
             makeLeftHandSideExpression(refAssignment ?? prefix),
-            {
+            makeNode({
               ...glob,
               mod: false,
               expression: call,
@@ -6695,7 +6703,7 @@ ${js}`
                 (ref3 = glob.children)[ref3.length - 1]
                 // "]" token
               ]
-            },
+            }),
             ...children.slice(i + 1)
           ]
         });
@@ -8045,6 +8053,7 @@ ${js}`
     ArrayElementDelimiter,
     ElementListWithIndentedApplicationForbidden,
     ElementList,
+    SingleLineElementList,
     ElementListRest,
     ArrayElementExpression,
     NestedBulletedArray,
@@ -8057,6 +8066,7 @@ ${js}`
     BulletedArrayWithTrailing,
     ObjectLiteral,
     BracedObjectLiteral,
+    SingleLineObjectProperties,
     BracedObjectLiteralContent,
     NestedImplicitObjectLiteral,
     NestedImplicitPropertyDefinitions,
@@ -11695,13 +11705,13 @@ ${js}`
       expression: fn
     };
   });
-  var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R15, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7) {
+  var FunctionExpression$5 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, __, (0, import_lib2.$N)((0, import_lib2.$EXPECT)($R15, "FunctionExpression /\\+\\+|--|[\\+\\-&]\\S/")), (0, import_lib2.$N)((0, import_lib2.$S)(Placeholder, (0, import_lib2.$C)(TypePostfix, BinaryOpRHS))), BinaryOp, __, NonPipelineAssignmentExpression, CloseParen), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6, $7, $8) {
     var open = $1;
     var ws1 = $2;
-    var op = $4;
-    var ws2 = $5;
-    var rhs = $6;
-    var close = $7;
+    var op = $5;
+    var ws2 = $6;
+    var rhs = $7;
+    var close = $8;
     const refA = makeRef("a");
     const fn = makeAmpersandFunction({
       ref: refA,
@@ -12403,7 +12413,30 @@ ${js}`
   var _ArrayLiteral$0 = (0, import_lib2.$T)((0, import_lib2.$S)(ArrayBindingPattern, UpcomingAssignment), function(value) {
     return value[0];
   });
-  var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, CloseBracket, ApplicationStart, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(NestedElementList, SingleLineElementList)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var open = $1;
+    var close = $2;
+    var content = $5;
+    if (!content)
+      return $skip;
+    let last = content[content.length - 1];
+    let lastArray = Array.isArray(last) ? last : last.children;
+    if (isComma(lastArray[lastArray.length - 1])) {
+      lastArray = lastArray.slice(0, -1);
+      if (Array.isArray(last)) {
+        last = lastArray;
+      } else {
+        last = { ...last, children: lastArray };
+      }
+      content = [...content.slice(0, -1), last];
+    }
+    return {
+      type: "ArrayExpression",
+      children: [open, ...content, close],
+      names: content.flatMap((c) => c?.names || [])
+    };
+  });
+  var _ArrayLiteral$2 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(ArrayLiteralContent, __, CloseBracket)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
     var open = $1;
     if (!$3)
       return $skip;
@@ -12424,8 +12457,8 @@ ${js}`
       names
     };
   });
-  var _ArrayLiteral$2 = NestedBulletedArray;
-  var _ArrayLiteral$$ = [_ArrayLiteral$0, _ArrayLiteral$1, _ArrayLiteral$2];
+  var _ArrayLiteral$3 = NestedBulletedArray;
+  var _ArrayLiteral$$ = [_ArrayLiteral$0, _ArrayLiteral$1, _ArrayLiteral$2, _ArrayLiteral$3];
   function _ArrayLiteral(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "_ArrayLiteral", _ArrayLiteral$$);
   }
@@ -12598,7 +12631,12 @@ ${js}`
   var ElementList$0 = (0, import_lib2.$T)((0, import_lib2.$S)(BulletedArray), function(value) {
     return [value[0]];
   });
-  var ElementList$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(EOS), ArrayElementExpression, (0, import_lib2.$Q)(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
+  var ElementList$1 = SingleLineElementList;
+  var ElementList$$ = [ElementList$0, ElementList$1];
+  function ElementList(ctx, state2) {
+    return (0, import_lib2.$EVENT_C)(ctx, state2, "ElementList", ElementList$$);
+  }
+  var SingleLineElementList$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)(EOS), ArrayElementExpression, (0, import_lib2.$Q)(ElementListRest)), function($skip, $loc, $0, $1, $2, $3) {
     var first = $2;
     var rest = $3;
     if (!rest.length)
@@ -12609,9 +12647,8 @@ ${js}`
       rest.map(([_2, e], i) => append(e, rest[i + 1]?.[0]))
     );
   });
-  var ElementList$$ = [ElementList$0, ElementList$1];
-  function ElementList(ctx, state2) {
-    return (0, import_lib2.$EVENT_C)(ctx, state2, "ElementList", ElementList$$);
+  function SingleLineElementList(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineElementList", SingleLineElementList$0);
   }
   var ElementListRest$0 = (0, import_lib2.$S)((0, import_lib2.$S)((0, import_lib2.$E)(_), Comma, (0, import_lib2.$N)(EOS)), ArrayElementExpression);
   function ElementListRest(ctx, state2) {
@@ -12790,7 +12827,29 @@ ${js}`
   function ObjectLiteral(ctx, state2) {
     return (0, import_lib2.$EVENT_C)(ctx, state2, "ObjectLiteral", ObjectLiteral$$);
   }
-  var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(BracedObjectLiteralContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
+  var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, CloseBrace, ApplicationStart, AllowAll, (0, import_lib2.$E)((0, import_lib2.$C)(NestedPropertyDefinitions, SingleLineObjectProperties)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4, $5, $6) {
+    var open = $1;
+    var close = $2;
+    var properties = $5;
+    if (!properties?.length)
+      return $skip;
+    let last = properties[properties.length - 1];
+    if (last.delim?.implicit) {
+      last = {
+        ...last,
+        delim: void 0,
+        children: last.children.filter((c) => c !== last.delim)
+      };
+      properties = [...properties.slice(0, properties.length - 1), last];
+    }
+    return {
+      type: "ObjectExpression",
+      children: [open, properties, close],
+      names: properties.flatMap((c) => c.names || []),
+      properties
+    };
+  });
+  var BracedObjectLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace, AllowAll, (0, import_lib2.$E)((0, import_lib2.$S)(BracedObjectLiteralContent, __, CloseBrace)), RestoreAll), function($skip, $loc, $0, $1, $2, $3, $4) {
     var open = $1;
     if (!$3)
       return $skip;
@@ -12802,13 +12861,13 @@ ${js}`
       properties
     };
   });
+  var BracedObjectLiteral$$ = [BracedObjectLiteral$0, BracedObjectLiteral$1];
   function BracedObjectLiteral(ctx, state2) {
-    return (0, import_lib2.$EVENT)(ctx, state2, "BracedObjectLiteral", BracedObjectLiteral$0);
+    return (0, import_lib2.$EVENT_C)(ctx, state2, "BracedObjectLiteral", BracedObjectLiteral$$);
   }
-  var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Q)((0, import_lib2.$S)(PropertyDefinition, ObjectPropertyDelimiter)), (0, import_lib2.$E)(NestedPropertyDefinitions)), function($skip, $loc, $0, $1, $2) {
-    var line = $1;
-    var nested = $2;
-    line = line.flatMap(([prop, delim]) => {
+  var SingleLineObjectProperties$0 = (0, import_lib2.$TV)((0, import_lib2.$Q)((0, import_lib2.$S)(PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
+    var line = $0;
+    return line.flatMap(([prop, delim]) => {
       prop = Array.isArray(prop) ? prop : [prop];
       let last = prop[prop.length - 1];
       if (!last)
@@ -12820,6 +12879,13 @@ ${js}`
       };
       return [...prop.slice(0, prop.length - 1), last];
     });
+  });
+  function SingleLineObjectProperties(ctx, state2) {
+    return (0, import_lib2.$EVENT)(ctx, state2, "SingleLineObjectProperties", SingleLineObjectProperties$0);
+  }
+  var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(SingleLineObjectProperties, (0, import_lib2.$E)(NestedPropertyDefinitions)), function($skip, $loc, $0, $1, $2) {
+    var line = $1;
+    var nested = $2;
     return line.concat(nested || []);
   });
   var BracedObjectLiteralContent$1 = (0, import_lib2.$TV)((0, import_lib2.$P)((0, import_lib2.$S)(__, PropertyDefinition, ObjectPropertyDelimiter)), function($skip, $loc, $0, $1) {
@@ -12951,8 +13017,8 @@ ${js}`
   }
   var ObjectPropertyDelimiter$0 = (0, import_lib2.$S)((0, import_lib2.$E)(_), Comma);
   var ObjectPropertyDelimiter$1 = (0, import_lib2.$Y)((0, import_lib2.$S)(__, (0, import_lib2.$EXPECT)($L37, 'ObjectPropertyDelimiter "}"')));
-  var ObjectPropertyDelimiter$2 = (0, import_lib2.$T)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertComma), function(value) {
-    return value[1];
+  var ObjectPropertyDelimiter$2 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$Y)(EOS), InsertComma), function($skip, $loc, $0, $1, $2) {
+    return { ...$2, implicit: true };
   });
   var ObjectPropertyDelimiter$$ = [ObjectPropertyDelimiter$0, ObjectPropertyDelimiter$1, ObjectPropertyDelimiter$2];
   function ObjectPropertyDelimiter(ctx, state2) {
@@ -15731,8 +15797,9 @@ ${js}`
     return (0, import_lib2.$EVENT_C)(ctx, state2, "ModuleExportName", ModuleExportName$$);
   }
   var ModuleSpecifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnprocessedModuleSpecifier, (0, import_lib2.$E)(ImportAssertion)), function($skip, $loc, $0, $1, $2) {
-    var a = $2;
-    let { token } = $1;
+    var module = $1;
+    var assertion = $2;
+    let { token } = module;
     if (config.rewriteTsImports) {
       token = token.replace(/\.([mc])?ts(['"])$/, ".$1js$2");
     }
@@ -15742,9 +15809,15 @@ ${js}`
         `${config.rewriteCivetImports.replace(/\$/g, "$$")}$1`
       );
     }
-    if (a)
-      return [{ ...$1, token }, a];
-    return { ...$1, token };
+    if (token !== module.token) {
+      module = { ...module, token, input: module.token };
+    }
+    return {
+      type: "ModuleSpecifier",
+      module,
+      assertion,
+      children: [module, assertion]
+    };
   });
   function ModuleSpecifier(ctx, state2) {
     return (0, import_lib2.$EVENT)(ctx, state2, "ModuleSpecifier", ModuleSpecifier$0);