Update Format (#503)

* Update Format * Update dependency nx to v17.3.1 * update default trailingComma to all (prettier 3) * formats * done * let's see * changelog --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jycouet <[email protected]>
jycouet · Feb 3, 2024 · ad174be · ad174be
1 parent b0b7bf0
commit ad174be
Show file tree

Hide file tree

Showing 37 changed files with 257 additions and 271 deletions.
diff --git a/.changeset/smooth-rockets-divide.md b/.changeset/smooth-rockets-divide.md
@@ -0,0 +1,5 @@
+---
+"@kitql/eslint-config": minor
+---
+
+bump to latest and update config with new defaults
diff --git a/package.json b/package.json
@@ -24,6 +24,6 @@
     "@vitest/coverage-v8": "^1.0.0",
     "esbuild": "^0.19.5",
     "rimraf": "5.0.0",
-    "nx": "17.2.0"
+    "nx": "17.3.1"
   }
 }
diff --git a/packages/create-kitql/bin.js b/packages/create-kitql/bin.js
@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import * as p from '@clack/prompts'
-import { bold, cyan, gray, green, italic } from '@kitql/helpers'
-import { program, Option } from 'commander'
 import fs from 'fs'
 import path from 'path'
 import { exit } from 'process'
 import { fileURLToPath } from 'url'
+import * as p from '@clack/prompts'
+import { Option, program } from 'commander'
+
+import { bold, cyan, gray, green, italic } from '@kitql/helpers'
 
 const { version } = JSON.parse(fs.readFileSync(new URL('package.json', import.meta.url), 'utf-8'))
 // eslint-disable-next-line no-console

diff --git a/packages/create-kitql/templates/sveltekit-remult/src/hooks/handleRemult.ts b/packages/create-kitql/templates/sveltekit-remult/src/hooks/handleRemult.ts
@@ -1,10 +1,9 @@
+// import { createPostgresDataProvider } from 'remult/postgres';
+// import { DATABASE_URL } from '$env/static/private'
 import { remult } from 'remult'
 import { remultSveltekit } from 'remult/remult-sveltekit'
 
-// import { createPostgresDataProvider } from 'remult/postgres';
-// import { DATABASE_URL } from '$env/static/private';
-import { entities, controllers } from '../shared'
-import { Task } from '../shared'
+import { controllers, entities, Task } from '../shared'
 
 export const handleRemult = remultSveltekit({
   // dataProvider: createPostgresDataProvider({ connectionString: DATABASE_URL })

diff --git a/packages/create-kitql/templates/sveltekit-remult/src/lib/ROUTES.spec.ts b/packages/create-kitql/templates/sveltekit-remult/src/lib/ROUTES.spec.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
 
 import { route } from './ROUTES'
 

diff --git a/packages/create-kitql/templates/sveltekit-remult/src/routes/+page.svelte b/packages/create-kitql/templates/sveltekit-remult/src/routes/+page.svelte
@@ -1,6 +1,8 @@
 <script lang="ts">
-  import { remult } from 'remult'
   import { onDestroy, onMount } from 'svelte'
+
+  import { remult } from 'remult'
+
   import { Task, TasksController } from '../shared'
 
   let list: Task[] = []

diff --git a/packages/create-kitql/templates/sveltekit-remult/tsconfig.json b/packages/create-kitql/templates/sveltekit-remult/tsconfig.json
@@ -10,8 +10,8 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "moduleResolution": "bundler"
-  }
+    "moduleResolution": "bundler",
+  },
   // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
   //
   // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes

diff --git a/packages/create-kitql/tsconfig.json b/packages/create-kitql/tsconfig.json
@@ -8,7 +8,7 @@
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,
     "strict": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
   },
-  "include": ["./bin.js"]
+  "include": ["./bin.js"],
 }
diff --git a/packages/eslint-config/.prettierrc.cjs b/packages/eslint-config/.prettierrc.cjs
@@ -3,7 +3,7 @@ const { plugins, ...prettierConfig } = require('@theguild/prettier-config')
 module.exports = {
   ...prettierConfig,
   semi: false,
-  plugins: [...plugins, 'prettier-plugin-svelte', '@trivago/prettier-plugin-sort-imports'],
-  importOrder: ['<THIRD_PARTY_MODULES>', '^[./]'],
+  plugins: [...plugins, 'prettier-plugin-svelte'],
+  importOrder: ['<THIRD_PARTY_MODULES>', '', '^(\\$houdini|@kitql|remult|\\$)(.*)$', '', '^[./]'],
   importOrderSeparation: true,
 }
diff --git a/packages/eslint-config/cmd.js b/packages/eslint-config/cmd.js
@@ -1,8 +1,9 @@
 #!/usr/bin/env node
-import { Log, red } from '@kitql/helpers'
 import { spawn, spawnSync } from 'child_process'
-import { program, Option } from 'commander'
 import fs from 'fs'
+import { Option, program } from 'commander'
+
+import { Log, red } from '@kitql/helpers'
 
 const log = new Log('kitql-lint')
 

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -30,17 +30,16 @@
 		"@kitql/helpers": "0.8.8",
 		"@theguild/eslint-config": "^0.11.1",
 		"@theguild/prettier-config": "2.0.2",
-		"@trivago/prettier-plugin-sort-imports": "4.3.0",
-		"@typescript-eslint/eslint-plugin": "6.18.1",
-		"@typescript-eslint/parser": "6.18.1",
+		"@typescript-eslint/eslint-plugin": "6.20.0",
+		"@typescript-eslint/parser": "6.20.0",
 		"@vue/compiler-sfc": "3.4.7",
 		"commander": "^11.1.0",
 		"eslint": "8.56.0",
 		"eslint-config-prettier": "9.1.0",
 		"eslint-plugin-svelte": "2.35.0",
 		"eslint-plugin-unused-imports": "3.0.0",
-		"prettier": "3.1.0",
-		"prettier-plugin-sh": "0.13.1",
+		"prettier": "3.2.4",
+		"prettier-plugin-sh": "0.14.0",
 		"prettier-plugin-svelte": "3.1.0",
 		"prettier-plugin-tailwindcss": "0.5.7",
 		"svelte": "4.2.0",

diff --git a/packages/handles/jsconfig.json b/packages/handles/jsconfig.json
@@ -6,6 +6,6 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "sourceMap": true,
-    "moduleResolution": "NodeNext"
-  }
+    "moduleResolution": "NodeNext",
+  },
 }
diff --git a/packages/handles/src/lib/hooks/handleProxies.js b/packages/handles/src/lib/hooks/handleProxies.js
@@ -1,6 +1,7 @@
-import { Log } from '@kitql/helpers'
 import { error } from '@sveltejs/kit'
 
+import { Log } from '@kitql/helpers'
+
 /**
  * usage:
  *	import { sequence } from '@sveltejs/kit/hooks';

diff --git a/packages/helpers/src/lib/Log.browser.spec.ts b/packages/helpers/src/lib/Log.browser.spec.ts
@@ -1,6 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { Log } from './Log.js'
 import {
   bgBlack,
   bgBlackBright,
@@ -44,6 +43,7 @@ import {
   yellow,
   yellowBright,
 } from './colors/index.js'
+import { Log } from './Log.js'
 
 describe('kitql - helper - Log', () => {
   beforeEach(() => {

diff --git a/packages/helpers/src/lib/Log.spec.ts b/packages/helpers/src/lib/Log.spec.ts
@@ -1,6 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
 
-import { Log } from './Log.js'
 import {
   bgBlack,
   bgBlackBright,
@@ -44,6 +43,7 @@ import {
   yellow,
   yellowBright,
 } from './colors/index.js'
+import { Log } from './Log.js'
 import { stry0 } from './stry/stry.js'
 
 describe('kitql - helper - Log', () => {

diff --git a/packages/helpers/src/lib/Log.ts b/packages/helpers/src/lib/Log.ts
@@ -1,11 +1,11 @@
 import {
+  bgBlueBright,
+  bgGreen,
+  bgRedBright,
   bold,
   colorProcess,
   greenBright,
   redBright,
-  bgRedBright,
-  bgGreen,
-  bgBlueBright,
 } from './colors/index.js'
 
 export class Log {

diff --git a/packages/helpers/src/routes/about/+page.ts b/packages/helpers/src/routes/about/+page.ts
@@ -1,6 +1,6 @@
 // import {  underline } from '$lib/colors/index.js'
-import { Log } from '$lib/Log.js'
 import { underline } from '$lib/index.js'
+import { Log } from '$lib/Log.js'
 
 export const load = async () => {
   const l = new Log('@kitql/helpers')

diff --git a/packages/helpers/src/routes/sql/+page.ts b/packages/helpers/src/routes/sql/+page.ts
@@ -1,4 +1,3 @@
-import { Log } from '$lib/Log.js'
 import {
   bgBlack,
   bgBlackBright,
@@ -42,6 +41,7 @@ import {
   yellow,
   yellowBright,
 } from '$lib/index.js'
+import { Log } from '$lib/Log.js'
 
 const logSQL = new Log(
   'SQL',

diff --git a/packages/helpers/tsconfig.json b/packages/helpers/tsconfig.json
@@ -9,6 +9,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "moduleResolution": "NodeNext"
-  }
+    "moduleResolution": "NodeNext",
+  },
 }
diff --git a/packages/internals/src/lib/ast/ast.spec.ts b/packages/internals/src/lib/ast/ast.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect, describe } from 'vitest'
+import { describe, expect, test } from 'vitest'
 
 import { extractHtmlElementAttr_Text, format, parseTs } from './ast.js'
 

diff --git a/packages/internals/src/lib/fs/fs.spec.ts b/packages/internals/src/lib/fs/fs.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { getFilesUnder, read, write, relative } from './fs.js'
+import { getFilesUnder, read, relative, write } from './fs.js'
 
 describe('fs', () => {
   it('getFilesUnder', async () => {

diff --git a/packages/internals/src/lib/fs/fs.ts b/packages/internals/src/lib/fs/fs.ts
@@ -1,5 +1,4 @@
-import { readdirSync } from 'fs'
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs'
+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'fs'
 import { dirname, join, relative } from 'path'
 
 export function read(pathFile: string) {

diff --git a/packages/internals/tsconfig.json b/packages/internals/tsconfig.json
@@ -9,6 +9,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "moduleResolution": "NodeNext"
-  }
+    "moduleResolution": "NodeNext",
+  },
 }
diff --git a/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts b/packages/vite-plugin-kit-routes/src/lib/ROUTES.ts
@@ -46,10 +46,7 @@ const PAGES = {
     params?: { lang?: 'fr' | 'en' | 'hu' | 'at' | string; limit?: number },
     sp?: Record<string, string | number>,
   ) => {
-    return `${params?.lang ? `/${params?.lang}` : ''}/site${appendSp({
-      ...sp,
-      limit: params?.limit,
-    })}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/site${appendSp({ ...sp, limit: params?.limit })}`
   },
   '/site/[id]': (params?: {
     lang?: 'fr' | 'hu' | undefined
@@ -60,20 +57,15 @@ const PAGES = {
     params = params ?? {}
     params.lang = params.lang ?? 'fr'
     params.id = params.id ?? 'Vienna'
-    return `${params?.lang ? `/${params?.lang}` : ''}/site/${params.id}${appendSp({
-      limit: params.limit,
-      demo: params.demo,
-    })}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/site/${params.id}${appendSp({ limit: params.limit, demo: params.demo })}`
   },
   '/site_contract/[siteId]-[contractId]': (params: {
     siteId: string | number
     contractId: string | number
     lang?: 'fr' | 'en' | 'hu' | 'at' | string
     limit?: number
   }) => {
-    return `${params?.lang ? `/${params?.lang}` : ''}/site_contract/${params.siteId}-${
-      params.contractId
-    }${appendSp({ limit: params.limit })}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/site_contract/${params.siteId}-${params.contractId}${appendSp({ limit: params.limit })}`
   },
   '/a/[...rest]/z': (params: { rest: (string | number)[] }) => {
     return `/a/${params.rest?.join('/')}/z`
@@ -123,18 +115,13 @@ const ACTIONS = {
     lang?: 'fr' | 'en' | 'hu' | 'at' | string
     limit?: number
   }) => {
-    return `${params?.lang ? `/${params?.lang}` : ''}/contract/${params.id}${appendSp({
-      limit: params.limit,
-    })}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/contract/${params.id}${appendSp({ limit: params.limit })}`
   },
   'create /site': (params?: {
     lang?: 'fr' | 'en' | 'hu' | 'at' | string
     redirectTo?: 'list' | 'new' | 'detail'
   }) => {
-    return `${params?.lang ? `/${params?.lang}` : ''}/site?/create${appendSp(
-      { redirectTo: params?.redirectTo },
-      '&',
-    )}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/site?/create${appendSp({ redirectTo: params?.redirectTo }, '&')}`
   },
   'update /site/[id]': (params: {
     id: string | number
@@ -158,9 +145,7 @@ const ACTIONS = {
     extra?: 'A' | 'B'
   }) => {
     params.extra = params.extra ?? 'A'
-    return `${params?.lang ? `/${params?.lang}` : ''}/site_contract/${params.siteId}-${
-      params.contractId
-    }?/send${appendSp({ extra: params.extra }, '&')}`
+    return `${params?.lang ? `/${params?.lang}` : ''}/site_contract/${params.siteId}-${params.contractId}?/send${appendSp({ extra: params.extra }, '&')}`
   },
 }
 

diff --git a/packages/vite-plugin-kit-routes/src/lib/ast.ts b/packages/vite-plugin-kit-routes/src/lib/ast.ts
@@ -1,7 +1,8 @@
 import { parse } from '@babel/parser'
+import * as recast from 'recast'
+
 import { cyan, red, yellow } from '@kitql/helpers'
 import { read } from '@kitql/internals'
-import * as recast from 'recast'
 
 import { log, routes_path } from './plugin.js'
 

diff --git a/packages/vite-plugin-kit-routes/src/lib/plugin.ts b/packages/vite-plugin-kit-routes/src/lib/plugin.ts
@@ -1,10 +1,11 @@
-import { cyan, gray, green, italic, Log, red, stry0, yellow } from '@kitql/helpers'
-import { getFilesUnder, read, write, relative, dirname } from '@kitql/internals'
 import { spawn } from 'child_process'
 import { posix } from 'path'
 import type { Plugin } from 'vite'
 import { watchAndRun } from 'vite-plugin-watch-and-run'
 
+import { cyan, gray, green, italic, Log, red, stry0, yellow } from '@kitql/helpers'
+import { dirname, getFilesUnder, read, relative, write } from '@kitql/internals'
+
 import { getActionsOfServerPages, getMethodsOfServerFiles } from './ast.js'
 import { appendSp, format, routeFn } from './format.js'
 

diff --git a/packages/vite-plugin-kit-routes/src/lib/plugins.spec.ts b/packages/vite-plugin-kit-routes/src/lib/plugins.spec.ts
@@ -1,19 +1,20 @@
-import { getFilesUnder, read } from '@kitql/internals'
 import { describe, expect, it } from 'vitest'
 
+import { getFilesUnder, read } from '@kitql/internals'
+
 import type { KIT_ROUTES as KIT_ROUTES_ObjectPath } from '../test/ROUTES_format-object-path.js'
 import type { KIT_ROUTES as KIT_ROUTES_ObjectSymbol } from '../test/ROUTES_format-object-symbol.js'
 import type { KIT_ROUTES as KIT_ROUTES_RouteSymbol } from '../test/ROUTES_format-route-symbol.js'
 import {
   extractParamsFromPath,
-  transformToMetadata,
   formatKey,
-  run,
-  type Options,
-  type KindOfObject,
-  rmvOptional,
   rmvGroups,
+  rmvOptional,
   routes_path,
+  run,
+  transformToMetadata,
+  type KindOfObject,
+  type Options,
 } from './plugin.js'
 
 describe('vite-plugin-kit-routes', () => {

diff --git a/packages/vite-plugin-kit-routes/tsconfig.json b/packages/vite-plugin-kit-routes/tsconfig.json
@@ -9,6 +9,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "moduleResolution": "NodeNext"
-  }
+    "moduleResolution": "NodeNext",
+  },
 }
diff --git a/packages/vite-plugin-kit-routes/vite.config.ts b/packages/vite-plugin-kit-routes/vite.config.ts
@@ -1,7 +1,8 @@
-import type { KIT_ROUTES } from '$lib/ROUTES.js'
 import { sveltekit } from '@sveltejs/kit/vite'
 import { defineConfig } from 'vite'
 
+import type { KIT_ROUTES } from '$lib/ROUTES.js'
+
 import { kitRoutes } from './src/lib/index.js'
 
 // export function route(key: 'subGroup2', params: { first: string | number }): string
@@ -23,7 +24,8 @@ export default defineConfig({
       // default_type: 'string',
       // extra_search_params: 'with',
       // generated_file_path: 'src/lib/another_path_for_the_file.ts',
-      post_update_run: 'npm exec prettier ./src/lib/ROUTES.ts -- -w',
+      // post_update_run: 'npm exec prettier ./src/lib/ROUTES.ts -- -w',
+      post_update_run: 'kitql-lint --format -g ./src/lib/ROUTES.ts',
 
       PAGES: {
         // '/': { extra_search_params: 'with' },