@danielx/civet 0.8.12 → 0.8.13

package/dist/main.mjs

@@ -1829,8 +1829,8 @@ var declareHelper = {
       ts(": <T>(object: T, prop: PropertyKey) => boolean"),
       " = ({}.constructor",
       asAny,
-      ").hasOwn;\n"
-    ]]);
+      ").hasOwn"
+    ], ";\n"]);
   },
   is(isRef) {
     state.prelude.push(["", [
@@ -1839,9 +1839,8 @@ var declareHelper = {
       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.
@@ -1859,8 +1858,11 @@ var declareHelper = {
   },
   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"]),
@@ -1879,8 +1881,8 @@ var declareHelper = {
       "  } else {\n",
       "    return a.slice(end, start + 1).reverse()\n",
       "  }\n",
-      "});\n"
-    ]]);
+      "})"
+    ], ";\n"]);
   },
   div(divRef) {
     state.prelude.push(["", [
@@ -1888,8 +1890,8 @@ var declareHelper = {
       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(["", [
@@ -1897,14 +1899,15 @@ var declareHelper = {
       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) {
@@ -1925,9 +1928,8 @@ var declareHelper = {
         " extends never ? never : A))"
       ]),
       " = (a, b) => (a ? !b && a : b)",
-      asAny,
-      ";\n"
-    ]]);
+      asAny
+    ], ";\n"]);
   },
   xnor(xnorRef) {
     const Falsy = getHelperRef("Falsy");
@@ -1945,9 +1947,8 @@ var declareHelper = {
         " ? never : B))"
       ]),
       " = (a, b) => (a ? b : !b || a)",
-      asAny,
-      ";\n"
-    ]]);
+      asAny
+    ], ";\n"]);
   },
   concatAssign(ref) {
     state.prelude.push(["", [
@@ -1965,8 +1966,8 @@ var declareHelper = {
       asAny,
       ") : (lhs",
       asAny,
-      ").push(rhs), lhs);\n"
-    ]]);
+      ").push(rhs), lhs)"
+    ], ";\n"]);
   },
   AutoPromise(ref) {
     state.prelude.push([
@@ -4674,7 +4675,7 @@ function processDeclarationCondition(condition, rootCondition, parent) {
     const simple = ref === expression;
     let children;
     if (simple) {
-      ref = insertTrimmingSpace(ref, "");
+      ref = trimFirstSpace(ref);
       children = [ref];
     } else {
       children = [ref, initializer];
@@ -4864,9 +4865,12 @@ function processDeclarationConditionStatement(s) {
 }
 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, ")"];
@@ -4875,20 +4879,20 @@ function dynamizeImportDeclaration(decl) {
   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,
@@ -4965,7 +4969,7 @@ function dynamizeImportDeclarationExpression($0) {
       { type: "Await", children: "await" },
       " ",
       imp,
-      insertTrimmingSpace(ws2, ""),
+      trimFirstSpace(ws2),
       dynamizeFromClause(from),
       {
         type: "PropertyGlob",
@@ -6616,19 +6620,23 @@ function processCallMemberExpression(node) {
       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,
               ")"
             ]
           })
@@ -6640,7 +6648,7 @@ function processCallMemberExpression(node) {
         ...node,
         children: [
           makeLeftHandSideExpression(refAssignment ?? prefix),
-          {
+          makeNode({
             ...glob,
             mod: false,
             expression: call,
@@ -6651,7 +6659,7 @@ function processCallMemberExpression(node) {
               (ref3 = glob.children)[ref3.length - 1]
               // "]" token
             ]
-          },
+          }),
           ...children.slice(i + 1)
         ]
       });
@@ -8001,6 +8009,7 @@ var grammar = {
   ArrayElementDelimiter,
   ElementListWithIndentedApplicationForbidden,
   ElementList,
+  SingleLineElementList,
   ElementListRest,
   ArrayElementExpression,
   NestedBulletedArray,
@@ -8013,6 +8022,7 @@ var grammar = {
   BulletedArrayWithTrailing,
   ObjectLiteral,
   BracedObjectLiteral,
+  SingleLineObjectProperties,
   BracedObjectLiteralContent,
   NestedImplicitObjectLiteral,
   NestedImplicitPropertyDefinitions,
@@ -11651,13 +11661,13 @@ var FunctionExpression$4 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenParen, _
     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,
@@ -12359,7 +12369,30 @@ function ArrayLiteral(ctx, state2) {
 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;
@@ -12380,8 +12413,8 @@ var _ArrayLiteral$1 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBracket, Allo
     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$$);
 }
@@ -12554,7 +12587,12 @@ function ElementListWithIndentedApplicationForbidden(ctx, state2) {
 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)
@@ -12565,9 +12603,8 @@ var ElementList$1 = (0, import_lib2.$TS)((0, import_lib2.$S)((0, import_lib2.$N)
     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) {
@@ -12746,7 +12783,29 @@ var ObjectLiteral$$ = [ObjectLiteral$0, ObjectLiteral$1, ObjectLiteral$2, Object
 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;
@@ -12758,13 +12817,13 @@ var BracedObjectLiteral$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(OpenBrace,
     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)
@@ -12776,6 +12835,13 @@ var BracedObjectLiteralContent$0 = (0, import_lib2.$TS)((0, import_lib2.$S)((0,
     };
     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) {
@@ -12907,8 +12973,8 @@ function InlineObjectPropertyDelimiter(ctx, state2) {
 }
 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) {
@@ -15687,8 +15753,9 @@ function ModuleExportName(ctx, state2) {
   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");
   }
@@ -15698,9 +15765,15 @@ var ModuleSpecifier$0 = (0, import_lib2.$TS)((0, import_lib2.$S)(UnprocessedModu
       `${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);

package/dist/types.d.ts

@@ -49,6 +49,9 @@ declare module "@danielx/civet" {
     trace?: string
     parseOptions?: ParseOptions
   }
+  export type GenerateOptions = Omit<CompileOptions, "sourceMap"> & {
+    sourceMap?: undefined | SourceMap
+  }
   export type SyncCompileOptions = CompileOptions &
     { parseOptions?: { comptime?: false } }
 
@@ -61,6 +64,7 @@ declare module "@danielx/civet" {
       lines: SourceMapping[][]
     }
   }
+  export function SourceMap(source: string): SourceMap
 
   // TODO: Import ParseError class from Hera
   export type ParseError = {
@@ -93,7 +97,12 @@ declare module "@danielx/civet" {
   /** Warning: No caching */
   export function parseProgram<T extends CompileOptions>(source: string, options?: T):
     T extends { comptime: true } ? Promise<CivetAST> : CivetAST
-  export function generate(ast: CivetAST, options?: CompileOptions): string
+  export function generate(ast: CivetAST, options?: GenerateOptions): string
+
+  export const lib: {
+    gatherRecursive(ast: CivetAST, predicate: (node: CivetAST) => boolean): CivetAST[]
+    gatherRecursiveAll(ast: CivetAST, predicate: (node: CivetAST) => boolean): CivetAST[]
+  }
 
   const Civet: {
     version: string
@@ -101,6 +110,9 @@ declare module "@danielx/civet" {
     isCompileError: typeof isCompileError
     parse: typeof parse
     generate: typeof generate
+    SourceMap: typeof SourceMap
+    ParseError: typeof ParseError
+    ParseErrors: typeof ParseErrors
     sourcemap: {
       locationTable(input: string): number[]
       lookupLineColumn(table: number[], pos: number): [number, number]