fix

matteocacciola · Apr 3, 2023 · 9b71418 · 9b71418
1 parent c1e8c56
commit 9b71418
Show file tree

Hide file tree

Showing 29 changed files with 15 additions and 100 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,3 @@
 dist/*
 node_modules/*
-libraries/**/dist/*
-libraries/**/node_modules/*
 .eslintrc.js
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Sentiment Analysis for Node.js
 
-[![Coverage Status](https://coveralls.io/repos/github/matteocacciola/sentiment/badge.svg?branch=v1.0.3)](https://coveralls.io/github/matteocacciola/sentiment?branch=v1.0.3)
+[![Coverage Status](https://coveralls.io/repos/github/matteocacciola/sentiment/badge.svg?branch=v1.0.4)](https://coveralls.io/github/matteocacciola/sentiment?branch=v1.0.4)
 
 This library aims to provide a support for the analysis of texts, like the evaluation of Sentiment or Text Matching.
 Please, consult the various methods here provided in order to have a wide overview of the possible features provided

diff --git a/docs/libraries/naive-bayes.md b/docs/libraries/naive-bayes.md
@@ -16,5 +16,5 @@ classifier.classify('it is very sunny today');
 
 naive-bayes contains a default set of positive and negative data enough to seed the algorithm and produce decent results.
 The constructor function can optionally be passed custom paths to directories containing files with your own data.
-See [sentiment.ts](https://github.com/matteocacciola/sentiment/blob/master/libraries/naive-bayes/src/sentiment.ts) if
+See [sentiment.ts](https://github.com/matteocacciola/sentiment/blob/master/src/libraries/naive-bayes/sentiment.ts) if
 you need more details.
diff --git a/libraries/naive-bayes/.eslintrc.js b/libraries/naive-bayes/.eslintrc.js
diff --git a/libraries/naive-bayes/.gitignore b/libraries/naive-bayes/.gitignore
diff --git a/libraries/naive-bayes/package.json b/libraries/naive-bayes/package.json
diff --git a/libraries/naive-bayes/tsconfig.json b/libraries/naive-bayes/tsconfig.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,6 @@
   },
   "dependencies": {
     "@google-cloud/language": "^5.2.1",
-    "@matteocacciola/naive-bayes-sentiment-classifier": "file:libraries/naive-bayes",
     "axios": "^1.3.4",
     "dotenv": "^16.0.3",
     "google-gax": "^3.5.8",
@@ -21,6 +20,7 @@
   "description": "Collection of functions for sentiment analysis",
   "devDependencies": {
     "@types/lodash": "^4.14.191",
+    "@types/node": "^18.15.11",
     "@types/sentiment": "^5.0.1",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
@@ -41,7 +41,6 @@
   },
   "files": [
     "dist",
-    "libraries/**/dist",
     "node_modules",
     "README.md",
     "package.json"
@@ -67,16 +66,14 @@
   },
   "scripts": {
     "build": "tsc -p ./tsconfig-build.json",
-    "build:bayes": "cd libraries/naive-bayes/ && npm run build",
     "ci": "npm run lint && npm run build && npm run test",
     "clean": "if [ -d 'dist/' ]; then rm -rf dist; fi; if [ -f 'tsconfig-build.tsbuildinfo' ]; then rm tsconfig-build.tsbuildinfo; fi",
     "lint": "eslint 'src/**/*.ts'",
     "lint:fix": "eslint 'src/**/*.ts' --fix --ext .js,.ts .",
-    "preinstall": "npm run build:bayes",
-    "prebuild": "npm run clean && npm run build:bayes",
+    "prebuild": "npm run clean",
     "prepare": "husky install",
     "prepublishOnly": "npm run build",
     "test": "TZ=utc NODE_ENV=test vitest run --coverage"
   },
-  "version": "1.0.3"
+  "version": "1.0.4"
 }
diff --git a/libraries/naive-bayes/src/classifier.ts → src/libraries/naive-bayes/classifier.ts b/libraries/naive-bayes/src/classifier.ts → src/libraries/naive-bayes/classifier.ts
diff --git a/libraries/naive-bayes/src/corpus.ts → src/libraries/naive-bayes/corpus.ts b/libraries/naive-bayes/src/corpus.ts → src/libraries/naive-bayes/corpus.ts
diff --git a/libraries/naive-bayes/data/negative/1.txt → ...libraries/naive-bayes/data/negative/1.txt b/libraries/naive-bayes/data/negative/1.txt → ...libraries/naive-bayes/data/negative/1.txt
diff --git a/libraries/naive-bayes/data/negative/2.txt → ...libraries/naive-bayes/data/negative/2.txt b/libraries/naive-bayes/data/negative/2.txt → ...libraries/naive-bayes/data/negative/2.txt
diff --git a/libraries/naive-bayes/data/negative/3.txt → ...libraries/naive-bayes/data/negative/3.txt b/libraries/naive-bayes/data/negative/3.txt → ...libraries/naive-bayes/data/negative/3.txt
diff --git a/libraries/naive-bayes/data/negative/4.txt → ...libraries/naive-bayes/data/negative/4.txt b/libraries/naive-bayes/data/negative/4.txt → ...libraries/naive-bayes/data/negative/4.txt
diff --git a/libraries/naive-bayes/data/negative/5.txt → ...libraries/naive-bayes/data/negative/5.txt b/libraries/naive-bayes/data/negative/5.txt → ...libraries/naive-bayes/data/negative/5.txt
diff --git a/libraries/naive-bayes/data/positive/1.txt → ...libraries/naive-bayes/data/positive/1.txt b/libraries/naive-bayes/data/positive/1.txt → ...libraries/naive-bayes/data/positive/1.txt
diff --git a/libraries/naive-bayes/data/positive/2.txt → ...libraries/naive-bayes/data/positive/2.txt b/libraries/naive-bayes/data/positive/2.txt → ...libraries/naive-bayes/data/positive/2.txt
diff --git a/libraries/naive-bayes/data/positive/3.txt → ...libraries/naive-bayes/data/positive/3.txt b/libraries/naive-bayes/data/positive/3.txt → ...libraries/naive-bayes/data/positive/3.txt
diff --git a/libraries/naive-bayes/data/positive/4.txt → ...libraries/naive-bayes/data/positive/4.txt b/libraries/naive-bayes/data/positive/4.txt → ...libraries/naive-bayes/data/positive/4.txt
diff --git a/libraries/naive-bayes/data/positive/5.txt → ...libraries/naive-bayes/data/positive/5.txt b/libraries/naive-bayes/data/positive/5.txt → ...libraries/naive-bayes/data/positive/5.txt
diff --git a/libraries/naive-bayes/src/document.ts → src/libraries/naive-bayes/document.ts b/libraries/naive-bayes/src/document.ts → src/libraries/naive-bayes/document.ts
diff --git a/libraries/naive-bayes/src/helpers.ts → src/libraries/naive-bayes/helpers.ts b/libraries/naive-bayes/src/helpers.ts → src/libraries/naive-bayes/helpers.ts
diff --git a/libraries/naive-bayes/src/index.ts → src/libraries/naive-bayes/index.ts b/libraries/naive-bayes/src/index.ts → src/libraries/naive-bayes/index.ts
diff --git a/libraries/naive-bayes/src/sentiment.ts → src/libraries/naive-bayes/sentiment.ts b/libraries/naive-bayes/src/sentiment.ts → src/libraries/naive-bayes/sentiment.ts
@@ -5,8 +5,8 @@ export const bayesSentiment = (text: string, positivePath?: string, negativePath
   const positiveCorpus = new Corpus();
   const negativeCorpus = new Corpus();
 
-  if (!positivePath) positivePath = __dirname + '/../data/positive';
-  if (!negativePath) negativePath = __dirname + '/../data/negative';
+  if (!positivePath) positivePath = __dirname + '/data/positive';
+  if (!negativePath) negativePath = __dirname + '/data/negative';
 
   positiveCorpus.loadFromDirectory(positivePath);
   negativeCorpus.loadFromDirectory(negativePath);

diff --git a/libraries/naive-bayes/src/types.ts → src/libraries/naive-bayes/types.ts b/libraries/naive-bayes/src/types.ts → src/libraries/naive-bayes/types.ts
diff --git a/src/strategies/bayes.ts b/src/strategies/bayes.ts
@@ -1,6 +1,6 @@
-import { bayesSentiment } from '@matteocacciola/naive-bayes-sentiment-classifier';
 import { Strategy } from './interfaces';
 import { BayesStrategyOptions, ScoreStrategyOptions, ScoreStrategyType, SENTIMENTS, SentimentsType } from './types';
+import { bayesSentiment } from '../libraries/naive-bayes';
 
 const strategy: Strategy = {
   async evaluateScores(

diff --git a/tsconfig.json b/tsconfig.json
@@ -21,10 +21,8 @@
     "baseUrl": "."
   },
   "include": [
-    "libraries/**/src/**/*",
     "src/**/*.ts",
     "package.json",
-    "vite.config.ts",
-  ],
-  "exclude": ["libraries/**/src/index.ts"]
+    "vite.config.ts"
+  ]
 }
diff --git a/vite.config.ts b/vite.config.ts
@@ -3,7 +3,7 @@ import { configDefaults, defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     coverage: {
-      exclude: [...configDefaults.exclude, '**/utils/*', '**/index.ts', '**/__tests__/*', './libraries/**'],
+      exclude: [...configDefaults.exclude, '**/utils/*', '**/index.ts', '**/__tests__/*', '**/libraries/*'],
       provider: 'istanbul',
       reporter: ['text', 'json', 'html', 'lcov'],
       enabled: true,