Remove many default values, strategically place semicolons where it fixes tabstops jumps

Author: matijaoe

README.md

@@ -15,15 +15,15 @@ export const assignments: XSnippetDefinition = {
     },
     ca: {
       name: "const assignment",
-      body: "const $1 = $0",
+      body: "const $1 = $2;",
     },
     la: {
       name: "let assignment",
-      body: "let $1 = $0",
+      body: "let $1 = $2;",
     },
     cas: {
       name: "const string assignment",
-      body: "const $1 = '$0'",
+      body: "const $1 = '$2';",
     },
     car: {
       name: "const array assignment",

src/snippets/js/assignments.ts

@@ -15,7 +15,7 @@ export const functions: XSnippetDefinition = {
     },
     nfn: {
       name: "named arrow function",
-      body: "const ${1:name} = ($2) => {$0}",
+      body: "const ${1} = ($2) => {$0}",
     },
     nfna: {
       name: "async named arrow function",
@@ -37,25 +37,9 @@ export const functions: XSnippetDefinition = {
       name: "async arrow function with body",
       body: "async ($1) => {\n\t$0\n}",
     },
-    efn: {
-      name: "export function",
-      body: [
-        "export function ${1:name}($2) {",
-        "\t$0",
-        "}",
-      ],
-    },
-    edfn: {
-      name: "export default function",
-      body: "export default function ${1:name}($2) {\n\t$0\n}",
-    },
-    enfn: {
-      name: "export named arrow function",
-      body: "export const ${1:name} = ($2) => {$0}",
-    },
     iife: {
       name: "immediately-invoked function expression",
-      body: "((${1:arguments}) => {\n\t$0\n})($2)",
+      body: "(($1) => {\n\t$0\n})($2)",
     },
   },
 };

src/snippets/js/functions.ts

@@ -1,6 +1,6 @@
 import { XSnippetDefinition } from "../../models/app.ts";
 
-export const misc: XSnippetDefinitionk = {
+export const misc: XSnippetDefinition = {
   meta: {
     title: "Misc",
   },

src/snippets/js/misc.ts

@@ -7,23 +7,28 @@ export const modules: XSnippetDefinition = {
   snippets: {
     im: {
       name: "import from module",
-      body: "import { $2 } from '$1'",
+      body: "import { $2 } from '${1:module}';",
+    },
+    imd: {
+      name: "import default",
+      body: "import $2 from '${1:module}';",
+    },
+    ima: {
+      name: "import as",
+      body: "import ${2:*} as ${3:name} from '${1:module}';",
     },
     imf: {
       name: "import file",
-      body: "import '$1'",
+      body: "import '$1';",
     },
+    // TODO: decide on snippet prefix
     imp: {
       name: "import dynamic",
-      body: "import($0)",
-    },
-    imd: {
-      name: "import default",
-      body: "import $2 from '$1'$3;",
+      body: "import('$0')",
     },
-    ima: {
-      name: "import as",
-      body: "import ${2:*} as {3:name} from '$1'",
+    impa: {
+      name: "await import dynamic",
+      body: "await import('$0')",
     },
     ime: {
       name: "import meta env",
@@ -39,15 +44,31 @@ export const modules: XSnippetDefinition = {
     },
     exf: {
       name: "export from",
-      body: "export { $2 } from '$1'",
+      body: "export { $0 } from '${1:module}';",
     },
     exa: {
       name: "export all from",
-      body: "export * from '$1'",
+      body: "export * from '${1:module}';",
     },
     exo: {
       name: "export object",
       body: "export const ${1:name} = { $0 }",
     },
+    efn: {
+      name: "export function",
+      body: [
+        "export function ${1:name}($2) {",
+        "\t$0",
+        "}",
+      ],
+    },
+    edfn: {
+      name: "export default function",
+      body: "export default function ${1:name}($2) {\n\t$0\n}",
+    },
+    enfn: {
+      name: "export named arrow function",
+      body: "export const ${1:name} = ($2) => {$0}",
+    },
   },
 };

src/snippets/js/modules.ts

@@ -23,27 +23,27 @@ export const operatorsExpressionsLiterals = {
     },
     ore: {
       name: "logical OR expression",
-      body: "${1:value} || ${0:value}",
+      body: "$1 || $0",
     },
     ande: {
       name: "logical AND expression",
-      body: "${1:value} && ${0:value}",
+      body: "$1 && $0",
     },
     nce: {
       name: "nullish coalescing expression (??)",
-      body: "${1:item} ?? ${0:default}",
+      body: "$1 ?? $0",
     },
     eqe: {
       name: "strict equality expression",
-      body: "${1:value} === ${2:value}",
+      body: "$1 === $0",
     },
     ora: {
       name: "logical OR assignment (||=)",
-      body: "${1:name} ||= ${0:default}",
+      body: "$1 ||= $0",
     },
     nca: {
       name: "nullish coalescing assignment (??=)",
-      body: "${1:name} ??= ${0:default}",
+      body: "$1 ??= $0",
     },
     inc: {
       name: "addition assignment",

src/snippets/js/operators-expressions-literals.ts

@@ -7,12 +7,12 @@ export const promises: XSnippetDefinition = {
   snippets: {
     fet: {
       name: "fetch",
-      body: "fetch('$1').then(res => res.json())",
+      body: "fetch('$1'$2).then(res => res.json())",
     },
     feta: {
       name: "fetch assignment",
       body:
-        "const ${2|data,{ data }|} = await fetch('$1').then(res => res.json())",
+        "const ${1|data,{ data }|} = await fetch('$2'$3).then(res => res.json())",
     },
     pr: {
       name: "promise",
@@ -27,15 +27,15 @@ export const promises: XSnippetDefinition = {
       body: "Promise.reject($1)",
     },
     then: {
-      name: "promise .then",
+      name: "promise then()",
       body: "$1.then((${2:value}) => $0)",
     },
     catch: {
-      name: "promise .catch",
+      name: "promise catch()",
       body: "$1.catch((${2:err}) => $0)",
     },
     thenc: {
-      name: "promise .then.catch",
+      name: "promise then().catch()",
       body: "$1.then((${2:value}) => $3).catch((${4:err}) => $5)",
     },
     pra: {

src/snippets/js/promises.ts

@@ -8,27 +8,27 @@ export const uncategorized: XSnippetDefinition = {
   snippets: {
     uniq: {
       name: "array of unique values",
-      body: "[...new Set(${0:array})]",
+      body: "[...new Set($0)]",
     },
     pi: {
       name: "parse int",
-      body: "parseInt(${1:value}, ${2|10,2,8,16|})",
+      body: "parseInt($1, ${2|10,2,8,16|})",
     },
     pf: {
       name: "parse float",
-      body: "parseFloat(${1:value})",
+      body: "parseFloat($1)",
     },
     am: {
       name: "array merge",
-      body: "[...${1:arr}$2]",
+      body: "[...$1]",
     },
     om: {
       name: "object merge",
-      body: "{ ...${1:object}$2 }",
+      body: "{ ...$1 }",
     },
     aat: {
       name: "array.at",
-      body: "${1:items}.at(${2:0})",
+      body: "$1.at(${2:0})",
     },
     seq: {
       name: "sequence of 0..n",

src/snippets/js/uncategorized.ts

@@ -7,19 +7,19 @@ export const declarations: XSnippetDefinition = {
   snippets: {
     cat: {
       name: "const assignment (typed)",
-      body: "const ${1:name}: ${2:string} = ${3:value}",
+      body: "const $1: ${2:string} = $3",
     },
     lat: {
       name: "let assignment (typed)",
-      body: "let ${1:name}: ${2:string} = ${3:value}",
+      body: "let $1: ${2:string} = $3",
     },
     caat: {
       name: "array assignment (typed)",
-      body: "const ${1:items}: ${2:string}[] = [$0]",
+      body: "const $1: ${2:string}[] = [$0]",
     },
     caot: {
       name: "object assignment (typed)",
-      body: "const ${1:name}: ${2:object} = { $0 }",
+      body: "const $1: ${2:object} = { $0 }",
     },
   },
 };

src/snippets/ts/declarations.ts

@@ -19,11 +19,11 @@ export const types: XSnippetDefinition = {
     },
     tpu: {
       name: "type union",
-      body: "type ${1:Model} = ${2:first} | ${3:second}",
+      body: "type ${1:Model} = $2 | $3",
     },
     tpi: {
       name: "type intersection",
-      body: "type ${1:Model} = ${2:first} & ${3:second}",
+      body: "type ${1:Model} = $2 & $3",
     },
   },
 };