aws-amplify · ericclemmons · Apr 15, 2020 · Apr 15, 2020 · Apr 15, 2020 · Apr 15, 2020
diff --git a/packages/aws-amplify/__tests__/exports-test.ts b/packages/aws-amplify/__tests__/exports-test.ts
@@ -0,0 +1,96 @@
+import * as exported from '../src';
+
+describe('aws-amplify', () => {
+	describe('import * keys', () => {
+		it('should match snapshot', () => {
+			expect(Object.keys(exported)).toMatchInlineSnapshot(`
+			Array [
+			  "Amplify",
+			  "Analytics",
+			  "AWSPinpointProvider",
+			  "AWSKinesisProvider",
+			  "AWSKinesisFirehoseProvider",
+			  "AmazonPersonalizeProvider",
+			  "Auth",
+			  "Storage",
+			  "StorageClass",
+			  "API",
+			  "APIClass",
+			  "graphqlOperation",
+			  "DataStore",
+			  "Predicates",
+			  "PubSub",
+			  "Cache",
+			  "Interactions",
+			  "a",
+			  "button",
+			  "signInButton",
+			  "googleSignInButton",
+			  "signInButtonIcon",
+			  "auth0SignInButton",
+			  "facebookSignInButton",
+			  "amazonSignInButton",
+			  "oAuthSignInButton",
+			  "signInButtonContent",
+			  "formContainer",
+			  "formSection",
+			  "formField",
+			  "formRow",
+			  "hint",
+			  "input",
+			  "inputLabel",
+			  "label",
+			  "radio",
+			  "navBar",
+			  "navRight",
+			  "nav",
+			  "navItem",
+			  "photoPickerButton",
+			  "photoPlaceholder",
+			  "photoPlaceholderIcon",
+			  "container",
+			  "actionRow",
+			  "sectionHeader",
+			  "sectionHeaderHint",
+			  "sectionBody",
+			  "sectionHeaderContent",
+			  "sectionFooter",
+			  "sectionFooterPrimaryContent",
+			  "sectionFooterSecondaryContent",
+			  "selectInput",
+			  "strike",
+			  "strikeContent",
+			  "toast",
+			  "toastClose",
+			  "totpQrcode",
+			  "sumerianSceneContainer",
+			  "sumerianScene",
+			  "loadingOverlay",
+			  "loadingContainer",
+			  "loadingLogo",
+			  "loadingSceneName",
+			  "loadingBar",
+			  "loadingBarFill",
+			  "sceneErrorText",
+			  "sceneBar",
+			  "sceneName",
+			  "sceneActions",
+			  "actionButton",
+			  "tooltip",
+			  "actionIcon",
+			  "autoShowTooltip",
+			  "XR",
+			  "Predictions",
+			  "Logger",
+			  "Hub",
+			  "JS",
+			  "ClientDevice",
+			  "Signer",
+			  "I18n",
+			  "ServiceWorker",
+			  "default",
+			]
+		`);
+		});
+	});
+});
diff --git a/packages/aws-amplify/package.json b/packages/aws-amplify/package.json
@@ -46,5 +46,47 @@
     "@aws-amplify/storage": "^3.1.6",
     "@aws-amplify/ui": "^2.0.2",
     "@aws-amplify/xr": "^2.1.6"
+  },
+  "jest": {
+    "globals": {
+      "ts-jest": {
+        "diagnostics": false,
+        "tsConfig": {
+          "lib": [
+            "es5",
+            "es2015",
+            "dom",
+            "esnext.asynciterable",
+            "es2017.object"
+          ],
+          "allowJs": true
+        }
+      }
+    },
+    "transform": {
+      "^.+\\.(js|jsx|ts|tsx)$": "ts-jest"
+    },
+    "preset": "ts-jest",
+    "testRegex": "(/__tests__/.*|\\.(test|spec))\\.(tsx?|jsx?)$",
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "json",
+      "jsx"
+    ],
+    "testEnvironment": "jsdom",
+    "testURL": "http://localhost/",
+    "coverageThreshold": {
+      "global": {
+        "branches": 0,
+        "functions": 0,
+        "lines": 0,
+        "statements": 0
+      }
+    },
+    "coveragePathIgnorePatterns": [
+      "/node_modules/"
+    ]
   }
 }
diff --git a/packages/aws-amplify/src/index.ts b/packages/aws-amplify/src/index.ts
@@ -33,6 +33,7 @@ export {
 export { Auth } from '@aws-amplify/auth';
 export { Storage, StorageClass } from '@aws-amplify/storage';
 export { API, APIClass, graphqlOperation } from '@aws-amplify/api';
+export { DataStore, Predicates } from '@aws-amplify/datastore';
 export { PubSub } from '@aws-amplify/pubsub';
 export { default as Cache } from '@aws-amplify/cache';
 export { Interactions } from '@aws-amplify/interactions';

diff --git a/packages/core/src/Util/Reachability.ts b/packages/core/src/Util/Reachability.ts
@@ -1,3 +1,4 @@
+import { JS } from '@aws-amplify/core';
 import Observable from 'zen-observable-ts';
 
 type NetworkStatus = {
@@ -6,6 +7,14 @@ type NetworkStatus = {
 
 export default class ReachabilityNavigator implements Reachability {
 	networkMonitor(): Observable<NetworkStatus> {
+		if (JS.browserOrNode().isNode) {
+			return new Observable(observer => {
+				observer.next({ online: true });
+
+				return () => {};
+			});
+		}
+
 		return new Observable(observer => {
 			observer.next({ online: window.navigator.onLine });
 

diff --git a/packages/datastore/package.json b/packages/datastore/package.json
@@ -11,7 +11,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false,
+  "sideEffects": true,
   "scripts": {
     "test": "tslint 'src/**/*.ts' && jest -w 1 --coverage",
     "build-with-test": "npm test && npm run build",
@@ -35,16 +35,18 @@
   },
   "homepage": "https://aws-amplify.github.io/",
   "devDependencies": {
-    "@types/uuid": "3.4.5",
-    "fake-indexeddb": "3.0.0"
+    "@types/uuid": "3.4.5"
   },
   "dependencies": {
     "@aws-amplify/api": "^3.1.6",
     "@aws-amplify/core": "^3.2.3",
     "@aws-amplify/pubsub": "^3.0.7",
+    "fake-indexeddb": "3.0.0",
     "idb": "4.0.4",
     "immer": "6.0.1",
+    "isomorphic-ws": "^4.0.1",
     "uuid": "3.3.2",
+    "ws": "^7.2.3",
     "zen-observable-ts": "0.8.19",
     "zen-push": "0.2.1"
   },

diff --git a/packages/datastore/src/datastore/datastore.ts b/packages/datastore/src/datastore/datastore.ts
@@ -97,7 +97,9 @@ let storageClasses: TypeConstructorMap;
 
 const initSchema = (userSchema: Schema) => {
 	if (schema !== undefined) {
-		throw new Error('The schema has already been initialized');
+		console.warn('The schema has already been initialized');
+
+		return userClasses;
 	}
 
 	logger.log('validating schema', { schema: userSchema });
@@ -321,6 +323,24 @@ const createModelClass = <T extends PersistentModel>(
 				draft.id = source.id;
 			});
 		}
+
+		static fromJSON(json: T | T[]) {
+			if (Array.isArray(json)) {
+				return json.map(init => this.fromJSON(init));
+			}
+
+			const { id, ...init } = json;
+
+			// ! This is a double-init because `id` can't be provided via `new`.
+			return produce(
+				new clazz(init as ModelInit<T>),
+				(draft: Draft<T & ModelInstanceMetadata>) => {
+					initializeInstance(init, modelDefinition, draft);
+
+					draft.id = id;
+				}
+			);
+		}
 	});
 
 	clazz[immerable] = true;

diff --git a/packages/datastore/src/storage/adapter/getDefaultAdapter/index.ts b/packages/datastore/src/storage/adapter/getDefaultAdapter/index.ts
@@ -1,11 +1,15 @@
+import { JS } from '@aws-amplify/core';
 import { Adapter } from '..';
 
 const getDefaultAdapter: () => Adapter = () => {
-	if (window.indexedDB) {
+	const { isBrowser, isNode } = JS.browserOrNode();
+	if (isNode) {
+		require('fake-indexeddb/auto');
 		return require('../indexeddb').default;
 	}
-	if (process && process.env) {
-		throw new Error('Node is not supported');
+
+	if (isBrowser && window.indexedDB) {
+		return require('../indexeddb').default;
 	}
 };
 

diff --git a/packages/predictions/src/Providers/AmazonAIConvertPredictionsProvider.ts b/packages/predictions/src/Providers/AmazonAIConvertPredictionsProvider.ts
@@ -24,6 +24,8 @@ import {
 	MessageHeaderValue,
 } from '@aws-sdk/eventstream-marshaller';
 import { fromUtf8, toUtf8 } from '@aws-sdk/util-utf8-node';
+import WebSocket from 'isomorphic-ws';
+
 const logger = new Logger('AmazonAIConvertPredictionsProvider');
 const eventBuilder = new EventStreamMarshaller(toUtf8, fromUtf8);
 

diff --git a/packages/pubsub/src/Providers/AWSAppSyncRealTimeProvider.ts b/packages/pubsub/src/Providers/AWSAppSyncRealTimeProvider.ts
@@ -28,6 +28,7 @@ import {
 } from '@aws-amplify/core';
 import Cache from '@aws-amplify/cache';
 import Auth from '@aws-amplify/auth';
+import WebSocket from 'isomorphic-ws';
 import { AbstractPubSubProvider } from './PubSubProvider';
 import { CONTROL_MSG } from '../index';