feat: fix reference path of calculator

Author: da730

common/config/rush/pnpm-lock.yaml

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Bytedance Ltd. and/or its affiliates.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

packages/calculator/LICENSE

@@ -0,0 +1,42 @@
+{
+  "name": "@visactor/calculator",
+  "version": "0.0.0",
+  "description": "SQL-like query executor with DSL",
+  "main": "lib",
+  "module": "es",
+  "types": "es",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": "./es/index.js",
+      "require": "./lib/index.js"
+    }
+  },
+  "files": [
+    "README.md",
+    "dist",
+    "lib",
+    "es"
+  ],
+  "scripts": {
+    "clean": "rimraf es lib dist build *.tsbuildinfo",
+    "test": "jest --passWithNoTests",
+    "test:coverage": "jest --coverage",
+    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build": "npm-run-all clean --parallel build:esm build:cjs"
+  },
+  "dependencies": {
+    "ts-pattern": "~4.1.4"
+  },
+  "devDependencies": {
+    "@types/jest": "^26.0.0",
+    "@types/node": "*",
+    "jest": "^26.0.0",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^26.0.0",
+    "ts-node": "10.9.0",
+    "typescript": "4.9.5"
+  }
+}

packages/calculator/package.json

@@ -0,0 +1,21 @@
+/**
+ * NOTE: this file is symlink to '@aeolian/dev-config/tsconfig/build.cjs.json'
+ */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "lib",
+    "target": "es2018",
+    "module": "CommonJS",
+    "noEmit": false,
+    "sourceMap": false,
+  },
+  "exclude": [
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.stories.tsx",
+    "**/*.mock.ts",
+    "**/tests",
+    "**/mocks",
+  ],
+}

packages/calculator/tsconfig.cjs.json

@@ -0,0 +1,21 @@
+/**
+ * NOTE: this file is symlink to '@aeolian/dev-config/tsconfig/build.esm.json'
+ */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "es",
+    "target": "es2018",
+    "module": "ESNext",
+    "noEmit": false,
+    "sourceMap": false,
+  },
+  "exclude": [
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.stories.tsx",
+    "**/*.mock.ts",
+    "**/tests",
+    "**/mocks",
+  ],
+}

packages/calculator/tsconfig.esm.json

@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "declaration": true, //Generates corresponding d.ts files.
+
+    "baseUrl": ".",
+    "rootDir": "src",
+    "outDir": "es",
+    "types": [
+      "node",
+      "jest",
+    ],
+  },
+  "include": [
+    "src",
+  ],
+  // https://www.typescriptlang.org/docs/handbook/project-references.html#what-is-a-project-reference
+  "references": [
+  ],
+}

packages/calculator/tsconfig.json

@@ -35,6 +35,7 @@ export default defineConfig(({ mode }) => {
     },
     resolve: {
       alias: {
+        '@visactor/calculator': path.resolve(__dirname, '../../../calculator/src/index.ts')
         // ...localConf.resolve?.alias
       }
     },

packages/vmind/__tests__/browser/vite.config.ts

@@ -77,7 +77,7 @@
     "json5": "~2.2.3",
     "dayjs": "~1.11.10",
     "js-yaml": "~4.1.0",
-    "ts-pattern": "~5.0.6",
-    "node-sql-parser": "~4.17.0"
+    "node-sql-parser": "~4.17.0",
+    "@visactor/calculator": "workspace:*"
   }
 }

packages/vmind/package.json

@@ -4,7 +4,7 @@ import { mergeMap, parseRespondField, patchQueryInput, preprocessSQL, replaceOpe
 import { parseSqlAST } from './parseSqlAST';
 import { isArray } from 'lodash';
 import { DataQueryResponse, SQLAst } from './type';
-import { Query, query } from '../../../calculator';
+import { Query, query } from '@visactor/calculator';
 import { parseGPTResponse, requestGPT } from '../../utils';
 import { getQueryDatasetPrompt } from '../prompts';
 

packages/vmind/src/gpt/dataProcess/query/queryDataset.ts

@@ -1,5 +1,5 @@
 import { Select } from 'node-sql-parser';
-import { Query } from '../../../calculator';
+import { Query } from '@visactor/calculator';
 import { DataItem, SimpleFieldInfo } from '../../../typings';
 
 export type SQLAst = Select;

packages/vmind/src/gpt/dataProcess/query/type.ts

@@ -1,5 +1,5 @@
 import { isString } from 'lodash';
-import { Query } from '../../../calculator';
+import { Query } from '@visactor/calculator';
 import { detectFieldType } from '../../../common/dataProcess/utils';
 import { DataItem, SimpleFieldInfo } from '../../../typings';
 import { ASTParserContext, ASTParserPipe } from './type';

packages/vmind/src/gpt/dataProcess/query/utils.ts

@@ -6,7 +6,10 @@
     "baseUrl": "./",
     "rootDir": "./src",
     "outDir": "./esm",
-    "composite": true
+    "composite": true,
+    "paths": {
+      "@visactor/calculator": ["../calculator/src"],
+    }
   },
   "ts-node": {
     "transpileOnly": true,
@@ -16,6 +19,8 @@
   },
   "include": ["src"],
   "references": [
-
+    {
+      "path": "../calculator"
+    }
   ]
 }

packages/vmind/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "paths": {
+      "@visactor/calculator": ["../calculator/src"],
     }
   },
   "references": []

packages/vmind/tsconfig.test.json

@@ -63,6 +63,14 @@
       "tags": [
         "package"
       ]
+    },
+    {
+      "packageName": "@visactor/calculator",
+      "projectFolder": "packages/calculator",
+      "shouldPublish": false,
+      "tags": [
+        "package"
+      ]
     }
   ]
 }