@shell-shock/preset-script 0.1.2 → 0.2.1

package/dist/components/console-builtin.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"console-builtin.d.cts","names":[],"sources":["../../src/components/console-builtin.tsx"],"sourcesContent":[],"mappings":";;;;;;;;AA8EA;AA47BgB,iBA57BA,iBAAA,CAAA,CA47B4B,EA57BX,QA47BW;AAuJ5C;;;AAA8C,iBAvJ9B,4BAAA,CAAA,CAuJ8B,EAvJF,QAuJE;AAYnC,KAZC,+BAAA,GAAkC,OAYnC,CAXT,IAWS,CAXJ,wBAWI,EAAA,YAAA,CAAA,CAAA,GAAA;EAGA,IAAA,EAAA,SAAA,GAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,SAAA,GAAA,MAAA,GAAA,QAAA,GAAA,OAAA;EAAQ,OAAA,EAHR,mBAGQ;EAMH,aAAA,EAAA,KAAA,GAAA,MAA0B,GAAA,MAAA,GACjC,OAAA,GAAA,OAAA;EAoGO,WAAA,EAAA,MAAgB;EA4EhB,MAAA,CAAA,EAvLL,QAuLK;AAmChB,CAAA;AAoFA;AA0FA;AAQA;AAycgB,iBAn1BA,0BAAA,CAm1Bc,KAAA,EAl1BrB,+BAk1BqB,CAAA,EAl1BU,QAk1BV;;;;iBA9uBd,gBAAA,CAAA,GAAgB;;;;iBA4EhB,4BAAA,CAAA,GAA4B;;;;iBAmC5B,0BAAA,CAAA,GAA0B;;;;iBAoF1B,uBAAA,CAAA,GAAuB;;;;KA0F3B,6BAAA,GAAgC,KAC1C;;;;iBAOc,wBAAA,QAAgC,gCAA6B;;;;iBAyc7D,cAAA,CAAA,GAAc"}
+{"version":3,"file":"console-builtin.d.cts","names":[],"sources":["../../src/components/console-builtin.tsx"],"sourcesContent":[],"mappings":";;;;;;;;AA8EA;AA47BgB,iBA57BA,iBAAA,CAAA,CA47B4B,EA57BX,QA47BW;AAuJ5C;;;AAA8C,iBAvJ9B,4BAAA,CAAA,CAuJ8B,EAvJF,QAuJE;AAYnC,KAZC,+BAAA,GAAkC,OAYnC,CAXT,IAWS,CAXJ,wBAWI,EAAA,YAAA,CAAA,CAAA,GAAA;EAGA,IAAA,EAAA,SAAA,GAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,SAAA,GAAA,MAAA,GAAA,QAAA,GAAA,OAAA;EAAQ,OAAA,EAHR,mBAGQ;EAMH,aAAA,EAAA,KAAA,GAAA,MAA0B,GAAA,MAAA,GACjC,OAAA,GAAA,OAAA;EAoGO,WAAA,EAAA,MAAgB;EA4EhB,MAAA,CAAA,EAvLL,QAuLK;AAmChB,CAAA;AAsFA;AA0FA;AAQA;AAsegB,iBAl3BA,0BAAA,CAk3Bc,KAAA,EAj3BrB,+BAi3BqB,CAAA,EAj3BU,QAi3BV;;;;iBA7wBd,gBAAA,CAAA,GAAgB;;;;iBA4EhB,4BAAA,CAAA,GAA4B;;;;iBAmC5B,0BAAA,CAAA,GAA0B;;;;iBAsF1B,uBAAA,CAAA,GAAuB;;;;KA0F3B,6BAAA,GAAgC,KAC1C;;;;iBAOc,wBAAA,QAAgC,gCAA6B;;;;iBAse7D,cAAA,CAAA,GAAc"}

package/dist/components/console-builtin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"console-builtin.d.mts","names":[],"sources":["../../src/components/console-builtin.tsx"],"sourcesContent":[],"mappings":";;;;;;;;AA8EA;AA47BgB,iBA57BA,iBAAA,CAAA,CA47B4B,EA57BX,QA47BW;AAuJ5C;;;AAA8C,iBAvJ9B,4BAAA,CAAA,CAuJ8B,EAvJF,QAuJE;AAYnC,KAZC,+BAAA,GAAkC,OAYnC,CAXT,IAWS,CAXJ,wBAWI,EAAA,YAAA,CAAA,CAAA,GAAA;EAGA,IAAA,EAAA,SAAA,GAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,SAAA,GAAA,MAAA,GAAA,QAAA,GAAA,OAAA;EAAQ,OAAA,EAHR,mBAGQ;EAMH,aAAA,EAAA,KAAA,GAAA,MAA0B,GAAA,MAAA,GACjC,OAAA,GAAA,OAAA;EAoGO,WAAA,EAAA,MAAgB;EA4EhB,MAAA,CAAA,EAvLL,QAuLK;AAmChB,CAAA;AAoFA;AA0FA;AAQA;AAycgB,iBAn1BA,0BAAA,CAm1Bc,KAAA,EAl1BrB,+BAk1BqB,CAAA,EAl1BU,QAk1BV;;;;iBA9uBd,gBAAA,CAAA,GAAgB;;;;iBA4EhB,4BAAA,CAAA,GAA4B;;;;iBAmC5B,0BAAA,CAAA,GAA0B;;;;iBAoF1B,uBAAA,CAAA,GAAuB;;;;KA0F3B,6BAAA,GAAgC,KAC1C;;;;iBAOc,wBAAA,QAAgC,gCAA6B;;;;iBAyc7D,cAAA,CAAA,GAAc"}
+{"version":3,"file":"console-builtin.d.mts","names":[],"sources":["../../src/components/console-builtin.tsx"],"sourcesContent":[],"mappings":";;;;;;;;AA8EA;AA47BgB,iBA57BA,iBAAA,CAAA,CA47B4B,EA57BX,QA47BW;AAuJ5C;;;AAA8C,iBAvJ9B,4BAAA,CAAA,CAuJ8B,EAvJF,QAuJE;AAYnC,KAZC,+BAAA,GAAkC,OAYnC,CAXT,IAWS,CAXJ,wBAWI,EAAA,YAAA,CAAA,CAAA,GAAA;EAGA,IAAA,EAAA,SAAA,GAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,SAAA,GAAA,MAAA,GAAA,QAAA,GAAA,OAAA;EAAQ,OAAA,EAHR,mBAGQ;EAMH,aAAA,EAAA,KAAA,GAAA,MAA0B,GAAA,MAAA,GACjC,OAAA,GAAA,OAAA;EAoGO,WAAA,EAAA,MAAgB;EA4EhB,MAAA,CAAA,EAvLL,QAuLK;AAmChB,CAAA;AAsFA;AA0FA;AAQA;AAsegB,iBAl3BA,0BAAA,CAk3Bc,KAAA,EAj3BrB,+BAi3BqB,CAAA,EAj3BU,QAi3BV;;;;iBA7wBd,gBAAA,CAAA,GAAgB;;;;iBA4EhB,4BAAA,CAAA,GAA4B;;;;iBAmC5B,0BAAA,CAAA,GAA0B;;;;iBAsF1B,uBAAA,CAAA,GAAuB;;;;KA0F3B,6BAAA,GAAgC,KAC1C;;;;iBAOc,wBAAA,QAAgC,gCAA6B;;;;iBAse7D,cAAA,CAAA,GAAc"}

package/dist/components/console-builtin.mjs

@@ -983,7 +983,7 @@ function WriteLineFunctionDeclaration() {
     } else {
       const index = [" ", "/", "\\\\", ".", ",", "-", ":", "|", "@", "+"].reduce((ret, split) => {
         let current = ret;
-        while (stripAnsi(line).indexOf(split, current + 1) !== -1 && stripAnsi(line).indexOf(split, current + 1) <= maxLength) {
+        while (stripAnsi(line).indexOf(split, current + 1) !== -1 && stripAnsi(line).indexOf(split, current + 1) <= maxLength && (!/.*\\([^)]*$/.test(stripAnsi(line).slice(0, line.indexOf(split, current + 1))) || !/^[^(]*\\).*/.test(stripAnsi(line).slice(line.indexOf(split, current + 1) + 1)) || stripAnsi(line).slice(line.indexOf(split, current + 1) + 1).replace(/^.*\\)/, "").indexOf(split) !== -1)) {
           current = line.indexOf(split, current + 1);
         }
 
@@ -1301,6 +1301,7 @@ function DividerFunctionDeclaration() {
 						type: "number",
 						doc: "The width of the divider line. If not specified, the divider will span the full width of the console, minus the padding."
 					}),
+					createIntrinsic("hbr", {}),
 					createComponent(TSDoc, {
 						heading: "The border of the divider line. Can be 'primary', 'secondary', 'tertiary', or 'none'. If not specified, the default border style will be used.",
 						get children() {
@@ -1308,7 +1309,7 @@ function DividerFunctionDeclaration() {
 								get type() {
 									return ReflectionKind.string;
 								},
-								defaultValue: "\"primary\""
+								defaultValue: "primary"
 							})];
 						}
 					}),
@@ -1318,6 +1319,7 @@ function DividerFunctionDeclaration() {
 						type: "\"primary\" | \"secondary\" | \"tertiary\"",
 						doc: "The border style/color of the divider line. Can be 'primary', 'secondary', 'tertiary', or 'none'. If not specified, the default border style will be used."
 					}),
+					createIntrinsic("hbr", {}),
 					createComponent(TSDoc, {
 						heading: "Padding to apply to the line",
 						get children() {
@@ -1359,11 +1361,11 @@ function DividerFunctionDeclaration() {
 				optional: false
 			}],
 			get children() {
-				return code`const padding = options.padding ?? ${theme.padding.app * 4};
+				return code`const padding = options.padding ?? ${Math.max(theme.padding.app, 1) * 4};
         const width = options.width ?? (process.stdout.columns - (Math.max(padding, 0) * 2));
         const border = options.border === "tertiary" ? colors.border.app.divider.tertiary("${theme.borderStyles.app.divider.tertiary.top}") : options.border === "secondary" ? colors.border.app.divider.secondary("${theme.borderStyles.app.divider.secondary.top}") : colors.border.app.divider.primary("${theme.borderStyles.app.divider.primary.top}");
 
-        writeLine(" ".repeat(padding) + border.repeat(Math.max(width / ${theme.borderStyles.app.divider.primary.top.length ?? 1}, 0)));
+        writeLine(" ".repeat(Math.max(padding - ${theme.padding.app}, 0)) + border.repeat(Math.max(width / ${theme.borderStyles.app.divider.primary.top.length ?? 1}, 0)));
         `;
 			}
 		})
@@ -1456,7 +1458,7 @@ function TableFunctionDeclaration(props) {
 									get type() {
 										return ReflectionKind.property;
 									},
-									defaultValue: "\"primary\""
+									defaultValue: "primary"
 								})
 							];
 						}
@@ -1500,7 +1502,7 @@ function TableFunctionDeclaration(props) {
 									get type() {
 										return ReflectionKind.property;
 									},
-									defaultValue: "\"left\""
+									defaultValue: "left"
 								})
 							];
 						}
@@ -1822,14 +1824,17 @@ let colWidths = [] as number[];
 let rowDims = [] as Dimensions[];
 
 const calculateRowDimensions = () => {
+  colWidths = [];
   return cells.reduce((dims, row) => {
-    dims.push(row.reduce((dim, cell) => {
-      if (cell.width > dim.width) {
-        dim.width = cell.width;
-      }
+    dims.push(row.reduce((dim, cell, index) => {
+      dim.width += cell.width;
       if (cell.height > dim.height) {
         dim.height = cell.height;
       }
+      if (!colWidths[index] || cell.width > colWidths[index]!) {
+        colWidths[index] = cell.width;
+      }
+
       return dim;
     }, { width: 0, height: 0 } as Dimensions));
 
@@ -1837,14 +1842,13 @@ const calculateRowDimensions = () => {
   }, [] as Dimensions[]);
 }
 
-const maxWidth = Math.max(process.stdout.columns - ${Math.max(theme.padding.app, 0) * 2}, 0);
-rowDims = calculateRowDimensions();
-
 let recalculate!: boolean;
 do {
   recalculate = false;
-  rowDims.map((row, rowIndex) => {
-    if (row.width > maxWidth) {
+  rowDims = calculateRowDimensions();
+
+  rowDims.forEach((row, rowIndex) => {
+    if (!recalculate && row.width > Math.max(process.stdout.columns - ${Math.max(theme.padding.app, 0) * 2}, 0)) {
       const cell = cells[rowIndex]!.reduce((largestCell, cell) => {
         if (cell.width > largestCell.width) {
           return cell;
@@ -1854,7 +1858,7 @@ do {
 
       const lines = splitText(
         cell.value,
-        maxWidth - row.width - cell.width
+        Math.max(process.stdout.columns - ${Math.max(theme.padding.app, 0) * 2} - (row.width - (cell.width - cell.padding * 2)), 0)
       );
 
       cell.value = lines.join("\\n");
@@ -1865,49 +1869,68 @@ do {
     }
   });
 
-  if (recalculate) {
-    rowDims = calculateRowDimensions();
+  if (!recalculate && colWidths.reduce((a, b) => a + b, 0) > Math.max(process.stdout.columns - ${Math.max(theme.padding.app, 0) * 2}, 0)) {
+    let colIndex = 0;
+    const cell = cells.reduce((ret, row) => {
+      return row.reduce((largest, current, i) => {
+        if (largest.width < current.width) {
+          colIndex = i;
+          return current;
+        }
+        return largest;
+      }, ret);
+    }, cells[0]![0]!);
+
+    const lines = splitText(
+      cell.value,
+      Math.max(process.stdout.columns - ${Math.max(theme.padding.app, 0) * 2} - (colWidths.filter((_, i) => i !== colIndex).reduce((a, b) => a + b, 0)) - cell.padding * 2), 0)
+    );
+
+    cell.value = lines.join("\\n");
+    cell.height = lines.length;
+    cell.width = Math.max(...lines.map(line => stripAnsi(line).length)) + cell.padding * 2;
+
+    recalculate = true;
   }
 } while (recalculate);
 
-rowDims.map((row, rowIndex) => {
-  cells[rowIndex]!.forEach(cell => {
-    cell.height = row.height;
-  });
-});
-
 // Render table
-cells.forEach(row => {
-  let line = "";
+cells.forEach((row, rowIndex) => {
+  const outputs = [] as string[][];
   row.forEach((cell, colIndex) => {
-    const cellContent = cell.value;
-    let paddedContent = "";
-    const totalPadding = cell.padding * 2;
-    const contentLength = stripAnsi(cellContent).length;
-    const totalWidth = colWidths[colIndex] ?? contentLength + totalPadding;
-
-    switch (cell.align) {
-      case "right":
-        paddedContent = " ".repeat(totalWidth - contentLength - totalPadding) + cellContent + " ".repeat(totalPadding);
-        break;
-      case "center":
-        const leftPadding = Math.floor((totalWidth - contentLength - totalPadding) / 2);
-        const rightPadding = totalWidth - contentLength - totalPadding - leftPadding;
-        paddedContent = " ".repeat(leftPadding) + cellContent + " ".repeat(rightPadding + totalPadding);
-        break;
-      case "left":
-      default:
-        paddedContent = " ".repeat(totalPadding) + cellContent + " ".repeat(totalWidth - contentLength - totalPadding);
-        break;
+    const lines = cell.value.split("\\n");
+    while (lines.length < rowDims[rowIndex]!.height) {
+      lines.push("");
     }
 
-    line += cell.border.left + paddedContent;
-    if (colIndex === row.length - 1) {
-      line +=  paddedContent + cell.border.right;
-    }
+    outputs.push(lines.map(line => {
+      let paddedContent = "";
+      switch (cell.align) {
+        case "right":
+          paddedContent = " ".repeat(Math.max(colWidths[colIndex] - stripAnsi(line).length - cell.padding, 0)) + line + " ".repeat(cell.padding);
+          break;
+        case "center":
+          const leftPadding = Math.floor((colWidths[colIndex] - stripAnsi(line).length - cell.padding) / 2);
+          const rightPadding = colWidths[colIndex] - stripAnsi(line).length - leftPadding;
+          paddedContent = " ".repeat(leftPadding) + line + " ".repeat(rightPadding);
+          break;
+        case "left":
+        default:
+          paddedContent = " ".repeat(cell.padding) + line + " ".repeat(Math.max(colWidths[colIndex] - stripAnsi(line).length - cell.padding, 0));
+          break;
+      }
+
+      if (colIndex === row.length - 1) {
+        return cell.border.left + paddedContent + cell.border.right;
+      } else {
+        return cell.border.left + paddedContent;
+      }
+    }));
   });
 
-  writeLine(line);
+  for (let index = 0; index < rowDims[rowIndex]!.height; index++) {
+    writeLine(outputs.map(output => output[index] ?? "").join(""));
+  }
 });
 `)
 				];
@@ -2004,7 +2027,7 @@ function ConsoleBuiltin() {
 					description: "verbose",
 					get prefix() {
 						return createComponent(IfStatement, {
-							condition: code`!(isDevelopment || isDebug || env.LOG_LEVEL === "debug" || hasFlag(["verbose", "verbose=true", "verbose=always", "debug", "debug=true", "debug=always"]))`,
+							condition: code`!(isDevelopment || isDebug || env.LOG_LEVEL === "debug" || hasFlag(["verbose", "verbose=true", "verbose=always"]))`,
 							children: code`return; `
 						});
 					}