@dbml/cli 5.6.0-alpha.2 → 6.0.0

package/package.json

@@ -1,16 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/cli",
-  "version": "5.6.0-alpha.2",
+  "version": "6.0.0",
   "description": "",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "scripts": {
-    "test": "vitest",
-    "test:watch": "vitest tests",
-    "coverage": "vitest --coverage",
-    "build": "rm -rf ./lib && tsc --noEmit && vite build",
-    "dev": "vite build --watch",
+    "test": "jest --coverage=false",
+    "coverage": "jest --coverage",
+    "build": "babel src --out-dir lib --copy-files",
     "prepublish": "npm run build",
     "lint": "eslint .",
     "lint:fix": "eslint --fix ."
@@ -31,19 +29,38 @@
     "dbml-cli"
   ],
   "dependencies": {
-    "@dbml/connector": "^5.6.0-alpha.2",
-    "@dbml/core": "^5.6.0-alpha.1",
+    "@babel/cli": "^7.21.0",
+    "@dbml/connector": "^6.0.0",
+    "@dbml/core": "^6.0.0",
     "bluebird": "^3.5.5",
     "chalk": "^2.4.2",
     "commander": "^2.20.0",
     "esm": "^3.2.25",
     "figures": "^3.2.0",
-    "lodash-es": "^4.17.15",
+    "lodash": "^4.17.15",
     "pegjs-require-import": "^0.0.2",
     "strip-ansi": "^5.2.0",
     "winston": "^3.2.1"
   },
-  "gitHead": "1c7351657e2fc9dffcdf96770c79ac8a333f6f76",
+  "devDependencies": {
+    "@babel/core": "^7.21.4",
+    "@babel/node": "^7.20.7",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-env": "^7.21.4",
+    "@babel/runtime": "^7.21.0",
+    "@stylistic/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.3",
+    "@typescript-eslint/parser": "^8.46.3",
+    "babel-jest": "^29.5.0",
+    "eslint": "^9.39.1",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-jest": "^29.0.1",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.4.5",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.3"
+  },
+  "gitHead": "75a218687814d8b1c538b26908745e0d0ee8b35a",
   "engines": {
     "node": ">=18"
   }

package/src/cli/import.js

@@ -31,9 +31,6 @@ export default async function importHandler (program) {
       console.log(`  ${chalk.green(figures.main.tick)} Generated DBML file from SQL file (${config[format].name}): ${path.basename(opts.outFile)}`);
     }
   } catch (error) {
-    if ('diags' in error) {
-      logger.error(`\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath, diag)).map(({ message }) => message).join('\n    ')}`);
-    }
-    throw error;
+    logger.error(`\n    ${error.diags.map((diag) => new SyntaxError(diag.filepath, diag)).map(({ message }) => message).join('\n    ')}`);
   }
 }

package/src/cli/utils.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 import { CompilerError } from '@dbml/core';
-import { reduce } from 'lodash-es';
+import { reduce } from 'lodash';
 
 function resolvePaths (paths) {
   if (!Array.isArray(paths)) {

package/src/errors/syntaxError.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash-es';
+import _ from 'lodash';
 import DomainError from './domainError';
 
 class SyntaxError extends DomainError {
@@ -11,7 +11,7 @@ class SyntaxError extends DomainError {
 
     message += '.';
 
-    if (!isEmpty(rootError)) {
+    if (!_.isEmpty(rootError)) {
       message += ` ${rootError.message}`;
     }
     super(message, rootError);

package/tsconfig.json

@@ -6,8 +6,7 @@
       "./"
     ], /* Allow multiple folders to be treated as one when resolving modules. */
     "baseUrl": "./src", /* Specify the base directory to resolve non-relative module names. */
-    "outDir": "./lib", /* Specify an output folder for all emitted files. */
-    "types": ["vitest/globals", "node"]
+    "outDir": "./lib" /* Specify an output folder for all emitted files. */
   },
   "files": [
     "package.json"

package/vite.config.ts

@@ -1,50 +0,0 @@
-/// <reference types="vitest" />
-
-import path from 'path';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "src/"),
-    },
-  },
-  build: {
-    target: 'node18',
-    outDir: 'lib',
-    minify: false,
-    lib: {
-      entry: path.resolve(__dirname, "src/index.js"),
-      fileName: 'index',
-      formats: ['cjs'],
-    },
-    rollupOptions: {
-      output: {
-        exports: 'named',
-      },
-      external: [
-        '@dbml/connector',
-        '@dbml/core',
-        'bluebird',
-        'chalk',
-        'commander',
-        'esm',
-        'figures',
-        'lodash',
-        'pegjs-require-import',
-        'strip-ansi',
-        'winston',
-        'path',
-        'fs',
-        /^node:.*/,
-      ],
-    },
-  },
-  test: {
-    globals: true,
-    coverage: {
-      provider: 'v8',
-      reporter: ['json', 'json-summary', 'html', 'text'],
-    },
-  },
-});