refactor package-json

packages/pluginkit/src/server/utils/v4/package-json.spec.ts

@@ -1,19 +0,0 @@
-import path from 'path';
-
-import { importPackageJson, validatePackageJson } from './package-json';
-
-it('importPackageJson() returns an object', async() => {
-  // when
-  const pkg = await importPackageJson(path.resolve(__dirname, '../../../../test/fixtures/example-package/template1'));
-
-  // then
-  expect(pkg).not.toBeNull();
-});
-
-it('validatePackageJson() returns a data object', async() => {
-  // when
-  const data = await validatePackageJson(path.resolve(__dirname, '../../../../test/fixtures/example-package/template1'));
-
-  // then
-  expect(data).not.toBeNull();
-});

packages/pluginkit/src/server/utils/v4/package-json/import.spec.ts

@@ -0,0 +1,11 @@
+import path from 'path';
+
+import { importPackageJson } from './import';
+
+it('importPackageJson() returns an object', async() => {
+  // when
+  const pkg = await importPackageJson(path.resolve(__dirname, '../../../../../test/fixtures/example-package/template1'));
+
+  // then
+  expect(pkg).not.toBeNull();
+});

packages/pluginkit/src/server/utils/v4/package-json/import.ts

@@ -0,0 +1,6 @@
+import path from 'path';
+
+export const importPackageJson = async(projectDirRoot: string): Promise<any> => {
+  const packageJsonUrl = path.resolve(projectDirRoot, 'package.json');
+  return import(packageJsonUrl);
+};

packages/pluginkit/src/server/utils/v4/package-json/index.ts

@@ -0,0 +1,2 @@
+export * from './import';
+export * from './validate';

packages/pluginkit/src/server/utils/v4/package-json/validate.spec.ts

@@ -0,0 +1,15 @@
+import path from 'path';
+
+import { validatePackageJson } from './validate';
+
+describe('validatePackageJson()', () => {
+
+  it('returns a data object', async() => {
+    // when
+    const data = await validatePackageJson(path.resolve(__dirname, '../../../../../test/fixtures/example-package/template1'));
+
+    // then
+    expect(data).not.toBeNull();
+  });
+
+});

packages/pluginkit/src/server/utils/v4/package-json.ts → packages/pluginkit/src/server/utils/v4/package-json/validate.ts

@@ -1,14 +1,9 @@
-import path from 'path';
+import { GrowiPluginType } from '~/consts';
+import { type GrowiPluginValidationData, GrowiPluginValidationError } from '~/model';
 
-import { GrowiPluginType } from '../../../consts';
-import { type GrowiPluginValidationData, GrowiPluginValidationError } from '../../../model';
+import { importPackageJson } from './import';
 
 
-export const importPackageJson = async(projectDirRoot: string): Promise<any> => {
-  const packageJsonUrl = path.resolve(projectDirRoot, 'package.json');
-  return import(packageJsonUrl);
-};
-
 export const validatePackageJson = async(projectDirRoot: string, expectedPluginType?: GrowiPluginType): Promise<GrowiPluginValidationData> => {
   const pkg = await importPackageJson(projectDirRoot);
 

packages/pluginkit/src/server/utils/v4/template.ts

@@ -3,9 +3,9 @@ import fs from 'fs';
 import path from 'path';
 import { promisify } from 'util';
 
-import { GrowiPluginType } from '../../../consts';
-import type { GrowiPluginValidationData, GrowiTemplatePluginValidationData } from '../../../model';
-import { GrowiPluginValidationError } from '../../../model';
+import { GrowiPluginType } from '~/consts';
+import type { GrowiPluginValidationData, GrowiTemplatePluginValidationData } from '~/model';
+import { GrowiPluginValidationError } from '~/model';
 
 import { importPackageJson, validatePackageJson } from './package-json';