Refactor file structure

package.json

@@ -17,7 +17,9 @@
   "author": "Jack Steam <jacksteamdev@gmail.com>",
   "files": [
     "lib",
-    "types"
+    "types",
+    "jest-chrome-schema.json",
+    "jest-chrome.d.ts"
   ],
   "main": "lib/index.cjs.js",
   "module": "lib/index.esm.js",

src/add-elements.ts

@@ -1,5 +1,5 @@
 import { createEvent } from './create-event'
-import { Storage } from './jest-chrome'
+import { Storage } from '../jest-chrome'
 
 /**
  * Namespace member data format from jest-chrome-schema.json

src/createHandler.ts

@@ -0,0 +1,68 @@
+import jestChromeSchema from '../jest-chrome-schema.json';
+import { addEvent, addFunction, addProperty } from './add-elements';
+import { JestChrome } from '../jest-chrome';
+
+export function createHandler(schema = jestChromeSchema as any): ProxyHandler<JestChrome> {
+  return {
+    ownKeys() {
+      return Reflect.ownKeys(schema);
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      if (prop in schema) {
+        return {
+          enumerable: true,
+          configurable: true,
+        };
+      }
+      else {
+        return {
+          enumerable: false,
+          configurable: false,
+        };
+      }
+    },
+    set(target, key, value) {
+      if (key in schema &&
+        key === 'lastError' &&
+        !(typeof value === 'object' &&
+          typeof value?.message === 'string')) {
+        throw new TypeError('chrome.runtime.lastError should be type { message: string }');
+      }
+      return Reflect.set(target, key, value);
+    },
+    deleteProperty(target, key) {
+      // Mark property as deleted, so it won't be retrieved from the schema
+      return Reflect.set(target, key, null);
+    },
+    has(target, key) {
+      const inTarget = key in target && Reflect.get(target, key);
+      return inTarget !== null && !!inTarget;
+    },
+    get(target, key) {
+      if (key in target) {
+        const value = Reflect.get(target, key);
+        // Check that the value wasn't deleted
+        return value !== null ? value : undefined;
+      }
+      else if (key in schema) {
+        switch (schema[key].type) {
+          case 'event':
+            return addEvent(schema[key], target);
+          case 'function':
+            return addFunction(schema[key], target);
+          case 'property':
+            return addProperty(schema[key], target);
+          // default is namespace
+          default: {
+            const proxy = new Proxy<Record<string, any>>({}, createHandler(schema[key]));
+            Object.assign(target, { [key]: proxy });
+            return proxy;
+          }
+        }
+      }
+      else {
+        return undefined;
+      }
+    },
+  };
+}

src/index.test.ts

@@ -1,15 +1,15 @@
 import { chrome } from '.'
-import { Storage, Runtime } from './jest-chrome'
+import { Storage, Runtime } from '../jest-chrome'
 import {
   CallableEvent,
   EventCallback,
   MonotypeEventSelector,
 } from './create-event'
 import { readJSONSync } from 'fs-extra'
-import { join } from 'path'
+import { resolve } from 'path'
 
 const chromeSchema = readJSONSync(
-  join(__dirname, 'jest-chrome-schema.json'),
+  resolve(__dirname, '..', 'jest-chrome-schema.json'),
 )
 
 afterEach(() => {

src/index.ts

@@ -1,92 +1,7 @@
-import { JestChrome as JestChromeNamespace } from './jest-chrome'
-import jestChromeSchema from './jest-chrome-schema.json'
-import {
-  addEvent,
-  addFunction,
-  addProperty,
-} from './add-elements'
-
-export type JestChrome = typeof JestChromeNamespace
+import { JestChrome } from '../jest-chrome'
+import { createHandler } from './createHandler'
 
 export const chrome = new Proxy<JestChrome>(
   {} as JestChrome,
   createHandler(),
 )
-
-export function createHandler(
-  schema = jestChromeSchema as any,
-): ProxyHandler<JestChrome> {
-  return {
-    ownKeys() {
-      return Reflect.ownKeys(schema)
-    },
-    getOwnPropertyDescriptor(target, prop) {
-      if (prop in schema) {
-        return {
-          enumerable: true,
-          configurable: true,
-        }
-      } else {
-        return {
-          enumerable: false,
-          configurable: false,
-        }
-      }
-    },
-    set(target, key, value) {
-      if (
-        key in schema &&
-        key === 'lastError' &&
-        !(
-          typeof value === 'object' &&
-          typeof value?.message === 'string'
-        )
-      ) {
-        throw new TypeError(
-          'chrome.runtime.lastError should be type { message: string }',
-        )
-      }
-
-      return Reflect.set(target, key, value)
-    },
-    deleteProperty(target, key) {
-      // Mark property as deleted, so it won't be retrieved from the schema
-      return Reflect.set(target, key, null)
-    },
-    has(target, key) {
-      const inTarget = key in target && Reflect.get(target, key)
-
-      return inTarget !== null && !!inTarget
-    },
-    get(target, key) {
-      if (key in target) {
-        const value = Reflect.get(target, key)
-        // Check that the value wasn't deleted
-        return value !== null ? value : undefined
-      } else if (key in schema) {
-        switch (schema[key].type) {
-          case 'event':
-            return addEvent(schema[key], target)
-          case 'function':
-            return addFunction(schema[key], target)
-          case 'property':
-            return addProperty(schema[key], target)
-
-          // default is namespace
-          default: {
-            const proxy = new Proxy<Record<string, any>>(
-              {},
-              createHandler(schema[key]),
-            )
-
-            Object.assign(target, { [key]: proxy })
-
-            return proxy
-          }
-        }
-      } else {
-        return undefined
-      }
-    },
-  }
-}