refactor: small changes

archoleat · Nov 11, 2024 · ee9cea1 · ee9cea1
1 parent 1e206ca
commit ee9cea1
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -34,9 +34,7 @@
   },
   "type": "module",
   "imports": {
-    "#app": "./src/app/index.ts",
-    "#index": "./src/index.ts",
-    "#shared": "./src/shared/index.ts"
+    "#validators": "./src/validators/index.ts"
   },
   "exports": {
     ".": "./index.js",

diff --git a/rollup.config.ts b/rollup.config.ts
@@ -6,8 +6,7 @@ import alias from '@rollup/plugin-alias';
 import typescript from '@rollup/plugin-typescript';
 
 const sourceFolder = 'src';
-const appFolder = `${sourceFolder}/app`;
-const sharedFolder = `${sourceFolder}/shared`;
+const validatorsFolder = `${sourceFolder}/validators`;
 const fileFormat = 'es';
 const fileName = 'index';
 const declarationFile = `${fileName}.d.ts`;
@@ -28,12 +27,8 @@ export default defineConfig([
       alias({
         entries: [
           {
-            find: '#app',
-            replacement: resolve(`${appFolder}/${entryFile}`),
-          },
-          {
-            find: '#shared',
-            replacement: resolve(`${sharedFolder}/${entryFile}`),
+            find: '#validators',
+            replacement: resolve(`${validatorsFolder}/${entryFile}`),
           },
         ],
       }),

diff --git a/src/index.ts b/src/index.ts
@@ -1 +1 @@
-export { FONT_FILE_NAME_REGEX, selectors } from '#app';
+export { FONT_FILE_NAME_REGEX, selectors } from '#validators';
diff --git a/src/shared/index.ts b/src/shared/index.ts
diff --git a/src/app/font-file-name.ts → src/validators/font-file-name.ts b/src/app/font-file-name.ts → src/validators/font-file-name.ts
@@ -1,4 +1,5 @@
-import { ITALIC_REGEX, VARIABLE_REGEX } from '#shared';
+import { ITALIC_REGEX } from './italic.ts';
+import { VARIABLE_REGEX } from './variable.ts';
 
 const LETTERS_REGEX = '[A-Z][a-z]';
 const FONT_FAMILY_REGEX = `^${LETTERS_REGEX}+(${LETTERS_REGEX}+)?`;

diff --git a/src/app/index.ts → src/validators/index.ts b/src/app/index.ts → src/validators/index.ts
@@ -1,2 +1,4 @@
 export { FONT_FILE_NAME_REGEX } from './font-file-name.ts';
+export { ITALIC_REGEX } from './italic.ts';
 export { selectors } from './selectors.ts';
+export { VARIABLE_REGEX } from './variable.ts';
diff --git a/src/shared/italic.ts → src/validators/italic.ts b/src/shared/italic.ts → src/validators/italic.ts
diff --git a/src/app/selectors.ts → src/validators/selectors.ts b/src/app/selectors.ts → src/validators/selectors.ts
diff --git a/src/shared/variable.ts → src/validators/variable.ts b/src/shared/variable.ts → src/validators/variable.ts
diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -14,8 +14,7 @@
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "paths": {
-      "#app": ["./src/app/index.ts"],
-      "#shared": ["./src/shared/index.ts"]
+      "#validators": ["./src/validators/index.ts"]
     },
     "rootDir": "src",
     "types": ["vitest"],
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { FONT_FILE_NAME_REGEX, selectors } from '#app';
		export { FONT_FILE_NAME_REGEX, selectors } from '#validators';