jaypie 1.0.20 → 1.0.22

package/README.md

@@ -235,7 +235,7 @@ See `HTTP` for status codes.
 
 ``` javascript
 // See `Error Reference` for full list
-const { InternalError } = require("@knowdev/errors");
+const { InternalError } = require("jaypie");
 
 try {
   // Code happens...
@@ -336,7 +336,7 @@ Returns `false` for `false` (case-insensitive) and `0` for string, boolean, and
 Returns `undefined` otherwise.
 
 ``` javascript
-const { envBoolean } = require("@knowdev/functions");
+const { envBoolean } = require("jaypie");
 
 process.env.AWESOME = true;
 
@@ -348,7 +348,7 @@ if (envBoolean("AWESOME")) {
 ##### `envBoolean`: `defaultValue`
 
 ``` javascript
-const { envBoolean } = require("@knowdev/functions");
+const { envBoolean } = require("jaypie");
 
 if (envBoolean("AWESOME", { defaultValue: true })) {
   console.log("Awesome!");
@@ -368,15 +368,19 @@ argument = force([thing], Array);
 // argument = [thing]
 ```
 
-`force` supports Array, Object, and String.
+`force` supports Array, Boolean, Number, Object, and String.
 
 ```javascript
 argument = force(argument, Array);
+argument = force(argument, Boolean, "true");
+argument = force(argument, Number, "12");
 argument = force(argument, Object, "key");
 argument = force(argument, String, "default");
 
 // Convenience functions
 argument = force.array(argument);
+argument = force.boolean(argument);
+argument = force.number(argument);
 argument = force.object(argument, "key");
 argument = force.string(argument);
 ```
@@ -412,16 +416,6 @@ await sleep(2000);
 
 _This is "bad code" because it checks `NODE_ENV` during runtime. The "right way" is to let sleep run and mock it in tests, in practice this is needless boilerplate. A fair compromise would be to mock `sleep` with `@jaypie/testkit` but not all projects include that dependency. Jaypie will trade academically incorrect for human convenience and simplicity._
 
-#### `sleepAlways`
-
-`sleepAlways` is a promise-based `setTimeout` that resolves after a specified number of milliseconds. It will run even when `NODE_ENV` is `test`. See `sleep` for a version that will NOT run in tests.
-
-```javascript
-import { sleepAlways } from "jaypie";
-
-await sleepAlways(2000);
-```
-
 #### `validate`
 
 ```javascript

package/dist/jaypie.cjs.js

@@ -1,90 +1,33 @@
 'use strict';
 
 var core = require('@jaypie/core');
+var aws = require('@jaypie/aws');
+var lambda = require('@jaypie/lambda');
+var mongoose = require('@jaypie/mongoose');
 
-//
-//
-// Helper Functions
-//
 
-const _importedModule = {};
-function dynamicImport(module) {
-  if (!_importedModule[module]) {
-    try {
-      _importedModule[module] = require(module);
-    } catch (error) {
-      if (process.env.NODE_ENV === "test") {
-        if (!_importedModule[module]) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            `[jaypie] Caught error requiring ${module} -- Is it installed?`,
-          );
-        }
-      }
-      throw new core.ConfigurationError();
-    }
-  }
-  return _importedModule[module];
-}
 
-function dynamicExport({
-  functions = ["default"],
-  moduleImport,
-  vars = [],
-} = {}) {
-  // Validate
-  if (!moduleImport || typeof moduleImport !== "string") {
-    throw new core.ConfigurationError("`moduleImport` must be a string");
-  }
-  if (!Array.isArray(functions)) {
-    throw new core.ConfigurationError("`functions` must be an array");
-  }
-  if (!Array.isArray(vars)) {
-    throw new core.ConfigurationError("`vars` must be an array");
-  }
-  if (!functions.length && !vars.length) {
-    throw new core.ConfigurationError(
-      "Either `functions` or `vars` must be provided",
-    );
-  }
-  // Process
-  try {
-    // Attempt to import the module
-    return dynamicImport(moduleImport);
-  } catch (error) {
-    core.log
-      .lib({ lib: core.JAYPIE.LIB.JAYPIE })
-      .trace(`[jaypie] ${moduleImport} could not be imported; continuing`);
-  }
-  // Return
-  const result = {};
-  functions.forEach((func) => {
-    result[func] = () => {
-      throw new core.ConfigurationError(`${moduleImport}.${func} is not available`);
-    };
-  });
-  vars.forEach((variable) => {
-    result[variable] = null;
-  });
-  return result;
-}
-
-//
-//
-// Export
-//
-
-module.exports = {
-  ...dynamicExport({
-    functions: ["getMessages", "getSecret", "sendBatchMessages", "sendMessage"],
-    moduleImport: core.JAYPIE.LIB.AWS,
-  }),
-  ...dynamicExport({
-    functions: ["lambdaHandler"],
-    moduleImport: core.JAYPIE.LIB.LAMBDA,
-  }),
-  ...dynamicExport({
-    functions: ["connectFromSecretEnv", "disconnect"],
-    moduleImport: core.JAYPIE.LIB.MONGOOSE,
-  }),
-};
+Object.keys(core).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return core[k]; }
+	});
+});
+Object.keys(aws).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return aws[k]; }
+	});
+});
+Object.keys(lambda).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return lambda[k]; }
+	});
+});
+Object.keys(mongoose).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return mongoose[k]; }
+	});
+});

package/dist/jaypie.esm.js

@@ -1,94 +1,4 @@
-import { ConfigurationError, log, JAYPIE } from '@jaypie/core';
 export * from '@jaypie/core';
-
-//
-//
-// Helper Functions
-//
-
-const _importedModule = {};
-async function dynamicImport(module) {
-  if (!_importedModule[module]) {
-    try {
-      // eslint-disable-next-line import/no-unresolved
-      _importedModule[module] = await import(module);
-    } catch (error) {
-      if (process.env.NODE_ENV === "test") {
-        if (!_importedModule[module]) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            `[jaypie] Caught error importing ${module} -- Is it installed?`,
-          );
-        }
-      }
-      throw new ConfigurationError();
-    }
-  }
-  return _importedModule[module];
-}
-
-//
-//
-// Main
-//
-
-var dynamicExport = async ({
-  functions = ["default"],
-  moduleImport,
-  vars = [],
-} = {}) => {
-  // Validate
-  if (!moduleImport || typeof moduleImport !== "string") {
-    throw new ConfigurationError("`moduleImport` must be a string");
-  }
-  if (!Array.isArray(functions)) {
-    throw new ConfigurationError("`functions` must be an array");
-  }
-  if (!Array.isArray(vars)) {
-    throw new ConfigurationError("`vars` must be an array");
-  }
-  if (!functions.length && !vars.length) {
-    throw new ConfigurationError(
-      "Either `functions` or `vars` must be provided",
-    );
-  }
-  // Process
-  try {
-    // Attempt to import the module
-    return await dynamicImport(moduleImport);
-  } catch (error) {
-    log
-      .lib({ lib: JAYPIE.LIB.JAYPIE })
-      .trace(`[jaypie] ${moduleImport} could not be imported; continuing`);
-  }
-  // Return
-  const result = {};
-  functions.forEach((func) => {
-    result[func] = () => {
-      throw new ConfigurationError(`${moduleImport}.${func} is not available`);
-    };
-  });
-  vars.forEach((variable) => {
-    result[variable] = null;
-  });
-  return result;
-};
-
-// Optional dependencies are wrapped in a dynamic import
-const { getMessages, getSecret, sendBatchMessages, sendMessage } =
-  await dynamicExport({
-    functions: ["getMessages", "getSecret", "sendBatchMessages", "sendMessage"],
-    moduleImport: JAYPIE.LIB.AWS,
-  });
-
-const { lambdaHandler } = await dynamicExport({
-  functions: ["lambdaHandler"],
-  moduleImport: JAYPIE.LIB.LAMBDA,
-});
-
-const { connectFromSecretEnv, disconnect } = await dynamicExport({
-  functions: ["connectFromSecretEnv", "disconnect"],
-  moduleImport: JAYPIE.LIB.MONGOOSE,
-});
-
-export { connectFromSecretEnv, disconnect, getMessages, getSecret, lambdaHandler, sendBatchMessages, sendMessage };
+export * from '@jaypie/aws';
+export * from '@jaypie/lambda';
+export * from '@jaypie/mongoose';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jaypie",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@jaypie/aws": "^1.0.5",
-    "@jaypie/core": "^1.0.25",
+    "@jaypie/core": "^1.0.26",
     "@jaypie/lambda": "^1.0.4",
     "@jaypie/mongoose": "^1.0.6"
   },

package/rollup.config.mjs

@@ -18,7 +18,7 @@ export default [
     ],
   },
   {
-    input: "src/index.cjs", // Path to your main JavaScript file
+    input: "src/index.js", // Path to the CommonJS file
     output: [
       {
         file: "dist/jaypie.cjs.js", // Output file for CommonJS

package/src/index.js

@@ -1,6 +1,3 @@
-import { JAYPIE } from "@jaypie/core";
-import dynamicExport from "./dynamicExport.function.js";
-
 //
 //
 // Export
@@ -9,19 +6,6 @@ import dynamicExport from "./dynamicExport.function.js";
 // Required dependencies
 export * from "@jaypie/core";
 
-// Optional dependencies are wrapped in a dynamic import
-export const { getMessages, getSecret, sendBatchMessages, sendMessage } =
-  await dynamicExport({
-    functions: ["getMessages", "getSecret", "sendBatchMessages", "sendMessage"],
-    moduleImport: JAYPIE.LIB.AWS,
-  });
-
-export const { lambdaHandler } = await dynamicExport({
-  functions: ["lambdaHandler"],
-  moduleImport: JAYPIE.LIB.LAMBDA,
-});
-
-export const { connectFromSecretEnv, disconnect } = await dynamicExport({
-  functions: ["connectFromSecretEnv", "disconnect"],
-  moduleImport: JAYPIE.LIB.MONGOOSE,
-});
+export * from "@jaypie/aws";
+export * from "@jaypie/lambda";
+export * from "@jaypie/mongoose";

package/src/index.cjs

@@ -1,88 +0,0 @@
-import { ConfigurationError, JAYPIE, log } from "@jaypie/core";
-
-//
-//
-// Helper Functions
-//
-
-const _importedModule = {};
-function dynamicImport(module) {
-  if (!_importedModule[module]) {
-    try {
-      _importedModule[module] = require(module);
-    } catch (error) {
-      if (process.env.NODE_ENV === "test") {
-        if (!_importedModule[module]) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            `[jaypie] Caught error requiring ${module} -- Is it installed?`,
-          );
-        }
-      }
-      throw new ConfigurationError();
-    }
-  }
-  return _importedModule[module];
-}
-
-function dynamicExport({
-  functions = ["default"],
-  moduleImport,
-  vars = [],
-} = {}) {
-  // Validate
-  if (!moduleImport || typeof moduleImport !== "string") {
-    throw new ConfigurationError("`moduleImport` must be a string");
-  }
-  if (!Array.isArray(functions)) {
-    throw new ConfigurationError("`functions` must be an array");
-  }
-  if (!Array.isArray(vars)) {
-    throw new ConfigurationError("`vars` must be an array");
-  }
-  if (!functions.length && !vars.length) {
-    throw new ConfigurationError(
-      "Either `functions` or `vars` must be provided",
-    );
-  }
-  // Process
-  try {
-    // Attempt to import the module
-    return dynamicImport(moduleImport);
-  } catch (error) {
-    log
-      .lib({ lib: JAYPIE.LIB.JAYPIE })
-      .trace(`[jaypie] ${moduleImport} could not be imported; continuing`);
-  }
-  // Return
-  const result = {};
-  functions.forEach((func) => {
-    result[func] = () => {
-      throw new ConfigurationError(`${moduleImport}.${func} is not available`);
-    };
-  });
-  vars.forEach((variable) => {
-    result[variable] = null;
-  });
-  return result;
-}
-
-//
-//
-// Export
-//
-
-module.exports = {
-  ...dynamicExport({
-    functions: ["getMessages", "getSecret", "sendBatchMessages", "sendMessage"],
-    moduleImport: JAYPIE.LIB.AWS,
-  }),
-  ...dynamicExport({
-    functions: ["lambdaHandler"],
-    moduleImport: JAYPIE.LIB.LAMBDA,
-  }),
-  ...dynamicExport({
-    functions: ["connectFromSecretEnv", "disconnect"],
-    moduleImport: JAYPIE.LIB.MONGOOSE,
-  }),
-};