@firebase/data-connect 0.4.0-canary.792c61671 → 0.4.0-canary.843a8d789

package/dist/index.cjs.js

@@ -8,7 +8,7 @@ var util = require('@firebase/util');
 var logger$1 = require('@firebase/logger');
 
 const name = "@firebase/data-connect";
-const version = "0.4.0-canary.792c61671";
+const version = "0.4.0-canary.843a8d789";
 
 /**
  * @license
@@ -1948,19 +1948,25 @@ function toQueryRef(serializedRef) {
  * limitations under the License.
  */
 /**
- * The generated SDK will allow the user to pass in either the variable or the data connect instance with the variable,
- * and this function validates the variables and returns back the DataConnect instance and variables based on the arguments passed in.
+ * The generated SDK will allow the user to pass in either the variables or the data connect instance
+ * with the variables. This function validates the variables and returns back the DataConnect instance
+ * and variables based on the arguments passed in.
+ *
+ * Generated SDKs generated from versions 3.2.0 and lower of the Data Connect emulator binary are
+ * NOT concerned with options, and will use this function to validate arguments.
+ *
  * @param connectorConfig
  * @param dcOrVars
  * @param vars
- * @param validateVars
+ * @param variablesRequired
  * @returns {DataConnect} and {Variables} instance
  * @internal
  */
-function validateArgs(connectorConfig, dcOrVars, vars, validateVars) {
+function validateArgs(connectorConfig, dcOrVars, vars, variablesRequired) {
     let dcInstance;
     let realVars;
-    if (dcOrVars && 'enableEmulator' in dcOrVars) {
+    const dcFirstArg = dcOrVars && 'enableEmulator' in dcOrVars;
+    if (dcFirstArg) {
         dcInstance = dcOrVars;
         realVars = vars;
     }
@@ -1968,11 +1974,59 @@ function validateArgs(connectorConfig, dcOrVars, vars, validateVars) {
         dcInstance = getDataConnect(connectorConfig);
         realVars = dcOrVars;
     }
-    if (!dcInstance || (!realVars && validateVars)) {
+    if (!dcInstance || (!realVars && variablesRequired)) {
         throw new DataConnectError(Code.INVALID_ARGUMENT, 'Variables required.');
     }
     return { dc: dcInstance, vars: realVars };
 }
+/**
+ * The generated SDK will allow the user to pass in either the variables or the data connect instance
+ * with the variables, and/or options. This function validates the variables and returns back the
+ * DataConnect instance and variables, and potentially options, based on the arguments passed in.
+ *
+ * Generated SDKs generated from versions 3.2.0 and higher of the Data Connect emulator binary are
+ * in fact concerned with options, and will use this function to validate arguments.
+ *
+ * @param connectorConfig
+ * @param dcOrVarsOrOptions
+ * @param varsOrOptions
+ * @param variablesRequired
+ * @param options
+ * @returns {DataConnect} and {Variables} instance, and optionally {ExecuteQueryOptions}
+ * @internal
+ */
+function validateArgsWithOptions(connectorConfig, dcOrVarsOrOptions, varsOrOptions, options, hasVars, variablesRequired) {
+    let dcInstance;
+    let realVars;
+    let realOptions;
+    const dcFirstArg = dcOrVarsOrOptions && 'enableEmulator' in dcOrVarsOrOptions;
+    if (dcFirstArg) {
+        dcInstance = dcOrVarsOrOptions;
+        if (hasVars) {
+            realVars = varsOrOptions;
+            realOptions = options;
+        }
+        else {
+            realVars = undefined;
+            realOptions = varsOrOptions;
+        }
+    }
+    else {
+        dcInstance = getDataConnect(connectorConfig);
+        if (hasVars) {
+            realVars = dcOrVarsOrOptions;
+            realOptions = varsOrOptions;
+        }
+        else {
+            realVars = undefined;
+            realOptions = dcOrVarsOrOptions;
+        }
+    }
+    if (!dcInstance || (!realVars && variablesRequired)) {
+        throw new DataConnectError(Code.INVALID_ARGUMENT, 'Variables required.');
+    }
+    return { dc: dcInstance, vars: realVars, options: realOptions };
+}
 
 /**
  * @license
@@ -2064,5 +2118,6 @@ exports.subscribe = subscribe;
 exports.terminate = terminate;
 exports.toQueryRef = toQueryRef;
 exports.validateArgs = validateArgs;
+exports.validateArgsWithOptions = validateArgsWithOptions;
 exports.validateDCOptions = validateDCOptions;
 //# sourceMappingURL=index.cjs.js.map