wrangler 0.0.0-afca1b6c → 0.0.0-afdb7e49

package/README.md

@@ -82,7 +82,3 @@ For more commands and options, refer to the [documentation](https://developers.c
 ## Documentation
 
 For the latest Wrangler documentation, [click here](https://developers.cloudflare.com/workers/wrangler/).
-
-```
-
-```

package/miniflare-dist/index.mjs

@@ -111,10 +111,10 @@ var require_mime = __commonJS({
   }
 });
 
-// ../pages-shared/src/environment-polyfills/index.ts
+// ../pages-shared/environment-polyfills/index.ts
 var polyfill;
 var init_environment_polyfills = __esm({
-  "../pages-shared/src/environment-polyfills/index.ts"() {
+  "../pages-shared/environment-polyfills/index.ts"() {
     polyfill = (environment) => {
       Object.entries(environment).map(([name, value]) => {
         Object.defineProperty(globalThis, name, {
@@ -128,7 +128,7 @@ var init_environment_polyfills = __esm({
   }
 });
 
-// ../pages-shared/src/environment-polyfills/miniflare.ts
+// ../pages-shared/environment-polyfills/miniflare.ts
 var miniflare_exports = {};
 import {
   fetch as miniflareFetch,
@@ -137,7 +137,7 @@ import {
   Response as MiniflareResponse
 } from "@miniflare/core";
 var init_miniflare = __esm({
-  "../pages-shared/src/environment-polyfills/miniflare.ts"() {
+  "../pages-shared/environment-polyfills/miniflare.ts"() {
     init_environment_polyfills();
     polyfill({
       fetch: miniflareFetch,
@@ -148,7 +148,7 @@ var init_miniflare = __esm({
   }
 });
 
-// ../pages-shared/src/asset-server/responses.ts
+// ../pages-shared/asset-server/responses.ts
 function mergeHeaders(base, extra) {
   base = new Headers(base ?? {});
   extra = new Headers(extra ?? {});
@@ -159,7 +159,7 @@ function mergeHeaders(base, extra) {
 }
 var OkResponse, MovedPermanentlyResponse, FoundResponse, NotModifiedResponse, PermanentRedirectResponse, NotFoundResponse, MethodNotAllowedResponse, NotAcceptableResponse, InternalServerErrorResponse, SeeOtherResponse, TemporaryRedirectResponse;
 var init_responses = __esm({
-  "../pages-shared/src/asset-server/responses.ts"() {
+  "../pages-shared/asset-server/responses.ts"() {
     OkResponse = class extends Response {
       constructor(...[body, init]) {
         super(body, {
@@ -278,10 +278,10 @@ ${err.stack}`;
   }
 });
 
-// ../pages-shared/src/asset-server/rulesEngine.ts
+// ../pages-shared/asset-server/rulesEngine.ts
 var ESCAPE_REGEX_CHARACTERS, escapeRegex, HOST_PLACEHOLDER_REGEX, PLACEHOLDER_REGEX2, replacer, generateRulesMatcher;
 var init_rulesEngine = __esm({
-  "../pages-shared/src/asset-server/rulesEngine.ts"() {
+  "../pages-shared/asset-server/rulesEngine.ts"() {
     ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
     escapeRegex = (str) => {
       return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
@@ -329,7 +329,7 @@ var init_rulesEngine = __esm({
   }
 });
 
-// ../pages-shared/src/asset-server/handler.ts
+// ../pages-shared/asset-server/handler.ts
 var handler_exports = {};
 __export(handler_exports, {
   ANALYTICS_VERSION: () => ANALYTICS_VERSION2,
@@ -491,34 +491,6 @@ async function generateHandler({
       ...Object.fromEntries(existingHeaders.entries()),
       ...Object.fromEntries(extraHeaders.entries())
     });
-    const headersMatcher = generateRulesMatcher(
-      headerRules,
-      ({ set = {}, unset = [] }, replacements) => {
-        const replacedSet = {};
-        Object.keys(set).forEach((key) => {
-          replacedSet[key] = replacer(set[key], replacements);
-        });
-        return {
-          set: replacedSet,
-          unset
-        };
-      }
-    );
-    const matches = headersMatcher({ request });
-    const setMap = /* @__PURE__ */ new Set();
-    matches.forEach(({ set = {}, unset = [] }) => {
-      Object.keys(set).forEach((key) => {
-        if (setMap.has(key.toLowerCase())) {
-          headers.append(key, set[key]);
-        } else {
-          headers.set(key, set[key]);
-          setMap.add(key.toLowerCase());
-        }
-      });
-      unset.forEach((key) => {
-        headers.delete(key);
-      });
-    });
     if (earlyHintsCache) {
       const preEarlyHintsHeaders = new Headers(headers);
       const earlyHintsCacheKey = `${protocol}//${host}${pathname}`;
@@ -537,8 +509,15 @@ async function generateHandler({
           (async () => {
             try {
               const links = [];
-              const transformedResponse = new HTMLRewriter().on("link[rel=preconnect],link[rel=preload]", {
+              const transformedResponse = new HTMLRewriter().on("link[rel~=preconnect],link[rel~=preload]", {
                 element(element) {
+                  for (const [attributeName] of element.attributes) {
+                    if (!ALLOWED_EARLY_HINT_LINK_ATTRIBUTES.includes(
+                      attributeName.toLowerCase()
+                    )) {
+                      return;
+                    }
+                  }
                   const href = element.getAttribute("href") || void 0;
                   const rel = element.getAttribute("rel") || void 0;
                   const as = element.getAttribute("as") || void 0;
@@ -568,6 +547,34 @@ async function generateHandler({
         );
       }
     }
+    const headersMatcher = generateRulesMatcher(
+      headerRules,
+      ({ set = {}, unset = [] }, replacements) => {
+        const replacedSet = {};
+        Object.keys(set).forEach((key) => {
+          replacedSet[key] = replacer(set[key], replacements);
+        });
+        return {
+          set: replacedSet,
+          unset
+        };
+      }
+    );
+    const matches = headersMatcher({ request });
+    const setMap = /* @__PURE__ */ new Set();
+    matches.forEach(({ set = {}, unset = [] }) => {
+      unset.forEach((key) => {
+        headers.delete(key);
+      });
+      Object.keys(set).forEach((key) => {
+        if (setMap.has(key.toLowerCase())) {
+          headers.append(key, set[key]);
+        } else {
+          headers.set(key, set[key]);
+          setMap.add(key.toLowerCase());
+        }
+      });
+    });
     return new Response(
       [101, 204, 205, 304].includes(response.status) ? null : response.body,
       {
@@ -716,9 +723,9 @@ function isPreview(url) {
   }
   return false;
 }
-var ASSET_PRESERVATION_CACHE, CACHE_CONTROL_PRESERVATION, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2;
+var ASSET_PRESERVATION_CACHE, CACHE_CONTROL_PRESERVATION, CACHE_CONTROL_BROWSER, REDIRECTS_VERSION2, HEADERS_VERSION2, HEADERS_VERSION_V1, ANALYTICS_VERSION2, ALLOWED_EARLY_HINT_LINK_ATTRIBUTES;
 var init_handler = __esm({
-  "../pages-shared/src/asset-server/handler.ts"() {
+  "../pages-shared/asset-server/handler.ts"() {
     init_responses();
     init_rulesEngine();
     ASSET_PRESERVATION_CACHE = "assetPreservationCache";
@@ -728,6 +735,7 @@ var init_handler = __esm({
     HEADERS_VERSION2 = 2;
     HEADERS_VERSION_V1 = 1;
     ANALYTICS_VERSION2 = 1;
+    ALLOWED_EARLY_HINT_LINK_ATTRIBUTES = ["rel", "as", "href"];
   }
 });
 
@@ -738,11 +746,11 @@ import {
   DurableObjectStub
 } from "@miniflare/durable-objects";
 import {
-  Log,
-  LogLevel,
+  Log as MiniflareLog,
+  LogLevel as MiniflareLogLevel,
   Miniflare,
-  Response as MiniflareResponse3,
-  Request as MiniflareRequest3
+  Request as MiniflareRequest3,
+  Response as MiniflareResponse3
 } from "miniflare";
 
 // ../../node_modules/yargs/lib/platform-shims/esm.mjs
@@ -5564,7 +5572,7 @@ var FatalError = class extends Error {
 import { existsSync, lstatSync, readFileSync as readFileSync5 } from "node:fs";
 import { join } from "node:path";
 
-// ../pages-shared/src/metadata-generator/constants.ts
+// ../pages-shared/metadata-generator/constants.ts
 var REDIRECTS_VERSION = 1;
 var HEADERS_VERSION = 2;
 var ANALYTICS_VERSION = 1;
@@ -5578,12 +5586,13 @@ var UNSET_OPERATOR = "! ";
 var SPLAT_REGEX = /\*/g;
 var PLACEHOLDER_REGEX = /:\w+/g;
 
-// ../pages-shared/src/metadata-generator/createMetadataObject.ts
+// ../pages-shared/metadata-generator/createMetadataObject.ts
 function createMetadataObject({
   redirects,
   headers,
   webAnalyticsToken,
   deploymentId,
+  failOpen,
   logger = (_message) => {
   }
 }) {
@@ -5591,7 +5600,8 @@ function createMetadataObject({
     ...constructRedirects({ redirects, logger }),
     ...constructHeaders({ headers, logger }),
     ...constructWebAnalytics({ webAnalyticsToken, logger }),
-    deploymentId
+    deploymentId,
+    failOpen
   };
 }
 function constructRedirects({
@@ -5691,7 +5701,7 @@ function constructWebAnalytics({
   };
 }
 
-// ../pages-shared/src/metadata-generator/validateURL.ts
+// ../pages-shared/metadata-generator/validateURL.ts
 var extractPathname = (path = "/", includeSearch, includeHash) => {
   if (!path.startsWith("/"))
     path = `/${path}`;
@@ -5734,7 +5744,7 @@ var validateUrl = (token, onlyRelative = false, includeSearch = false, includeHa
   ];
 };
 
-// ../pages-shared/src/metadata-generator/parseHeaders.ts
+// ../pages-shared/metadata-generator/parseHeaders.ts
 var LINE_IS_PROBABLY_A_PATH = new RegExp(/^([^\s]+:\/\/|^\/)/);
 function parseHeaders(input) {
   const lines = input.split("\n");
@@ -5869,7 +5879,7 @@ function isValidRule(rule) {
   return Object.keys(rule.headers).length > 0 || rule.unsetHeaders.length > 0;
 }
 
-// ../pages-shared/src/metadata-generator/parseRedirects.ts
+// ../pages-shared/metadata-generator/parseRedirects.ts
 function parseRedirects(input) {
   const lines = input.split("\n");
   const rules = [];
@@ -6099,7 +6109,10 @@ async function generateAssetsFetch(directory, log) {
           );
         }
         const body = readFileSync5(filepath);
-        const contentType = (0, import_mime.getType)(filepath) || "application/octet-stream";
+        let contentType = (0, import_mime.getType)(filepath) || "application/octet-stream";
+        if (contentType.startsWith("text/") && !contentType.includes("charset")) {
+          contentType = `${contentType}; charset=utf-8`;
+        }
         return { body, contentType };
       }
     });
@@ -6115,18 +6128,6 @@ var invalidAssetsFetch = () => {
   );
 };
 
-// src/miniflare-cli/enum-keys.ts
-var enumObject = (e) => {
-  const copy = { ...e };
-  Object.values(e).forEach(
-    (value) => typeof value === "number" && delete copy[value]
-  );
-  return copy;
-};
-var enumKeys = (e) => {
-  return Object.keys(enumObject(e));
-};
-
 // src/miniflare-cli/request-context.ts
 var getRequestContextCheckOptions = async () => {
   let hasAsyncLocalStorage = true;
@@ -6147,7 +6148,7 @@ var getRequestContextCheckOptions = async () => {
 };
 
 // src/miniflare-cli/index.ts
-var NoOpLog = class extends Log {
+var MiniflareNoOpLog = class extends MiniflareLog {
   log() {
   }
   error(message) {
@@ -6155,18 +6156,19 @@ var NoOpLog = class extends Log {
   }
 };
 async function main() {
-  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).option("log", {
-    choices: enumKeys(LogLevel)
-  }).argv;
-  const logLevel = LogLevel[args.log ?? "INFO"];
+  const args = await yargs_default(hideBin(process.argv)).help(false).version(false).argv;
   const requestContextCheckOptions = await getRequestContextCheckOptions();
   const config = {
     ...JSON.parse(args._[0] ?? "{}"),
     ...requestContextCheckOptions
   };
-  config.log = config.disableLogs ? new NoOpLog() : new Log(logLevel, config.logOptions);
-  if (logLevel > LogLevel.INFO) {
-    console.log("OPTIONS:\n", JSON.stringify(config, null, 2));
+  let logLevelString = config.logLevel.toUpperCase();
+  if (logLevelString === "LOG")
+    logLevelString = "INFO";
+  const logLevel = MiniflareLogLevel[logLevelString];
+  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel, config.logOptions);
+  if (logLevel === MiniflareLogLevel.DEBUG) {
+    console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }
   config.bindings = {
     ...config.bindings,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-afca1b6c",
+	"version": "0.0.0-afdb7e49",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -28,6 +28,11 @@
 	"bugs": {
 		"url": "https://github.com/cloudflare/wrangler2/issues"
 	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/cloudflare/wrangler2.git",
+		"directory": "packages/wrangler"
+	},
 	"license": "MIT OR Apache-2.0",
 	"author": "wrangler@cloudflare.com",
 	"main": "wrangler-dist/cli.js",
@@ -49,6 +54,7 @@
 		"Cloudflare_CA.pem"
 	],
 	"scripts": {
+		"assert-git-version": "node -r esbuild-register scripts/assert-git-version.ts",
 		"build": "npm run clean && npm run bundle && npm run emit-types",
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"check:type": "tsc",
@@ -57,7 +63,7 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "jest --silent=false --verbose=true",
+		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
@@ -87,17 +93,20 @@
 			]
 		},
 		"transformIgnorePatterns": [
-			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
+			"node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes|npx-import)"
 		]
 	},
 	"dependencies": {
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
+		"@miniflare/core": "2.10.0",
+		"@miniflare/d1": "2.10.0",
+		"@miniflare/durable-objects": "2.10.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "^2.8.1",
+		"miniflare": "2.10.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -105,12 +114,18 @@
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {
+		"@cloudflare/types": "^6.18.4",
+		"@databases/split-sql-query": "^1.0.3",
+		"@databases/sql": "^3.2.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
+		"@miniflare/tre": "^3.0.0-next.6",
+		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
 		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
+		"@types/javascript-time-ago": "^2.0.3",
 		"@types/mime": "^2.0.3",
 		"@types/prompts": "^2.0.14",
 		"@types/react": "^17.0.37",
@@ -121,17 +136,14 @@
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
 		"body-parser": "^1.20.0",
-		"busboy": "^1.6.0",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
 		"concurrently": "^7.2.2",
-		"create-cloudflare": "^1.0.0",
 		"devtools-protocol": "^0.0.955664",
 		"dotenv": "^16.0.0",
 		"execa": "^6.1.0",
 		"express": "^4.18.1",
-		"faye-websocket": "^0.11.4",
 		"finalhandler": "^1.2.0",
 		"find-up": "^6.3.0",
 		"get-port": "^6.1.2",
@@ -145,23 +157,28 @@
 		"ink-testing-library": "^2.1.0",
 		"ink-text-input": "^4.0.3",
 		"is-ci": "^3.0.1",
+		"javascript-time-ago": "^2.5.4",
 		"jest-fetch-mock": "^3.0.3",
 		"jest-websocket-mock": "^2.3.0",
 		"mime": "^3.0.0",
+		"minimatch": "^5.1.0",
 		"msw": "^0.47.1",
+		"npx-import": "^1.1.3",
 		"open": "^8.4.0",
 		"p-queue": "^7.2.0",
 		"pretty-bytes": "^6.0.0",
 		"prompts": "^2.4.2",
 		"react": "^17.0.2",
 		"react-error-boundary": "^3.1.4",
+		"remove-accents-esm": "^0.0.1",
+		"semiver": "^1.1.0",
 		"serve-static": "^1.15.0",
 		"signal-exit": "^3.0.7",
 		"supports-color": "^9.2.2",
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "^5.9.1",
+		"undici": "^5.11.0",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",

package/src/__tests__/access.test.ts

@@ -0,0 +1,25 @@
+import { domainUsesAccess, getAccessToken } from "../user/access";
+import { msw, mswAccessHandlers } from "./helpers/msw";
+
+describe("access", () => {
+	beforeEach(() => {
+		msw.use(...mswAccessHandlers);
+	});
+
+	describe("basic", () => {
+		it("should correctly detect an access protected domain", async () => {
+			expect(await domainUsesAccess("access-protected.com")).toBeTruthy();
+			expect(await domainUsesAccess("not-access-protected.com")).toBeFalsy();
+		});
+		it("should not fail without cloudflared installed", async () => {
+			expect(await getAccessToken("not-access-protected.com")).toBeFalsy();
+		});
+		it("should error without cloudflared installed on an access protected domain", async () => {
+			await expect(getAccessToken("access-protected.com")).rejects.toEqual(
+				new Error(
+					"To use Wrangler with Cloudflare Access, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
+				)
+			);
+		});
+	});
+});

package/src/__tests__/api-dev.test.ts

@@ -5,10 +5,10 @@ import { runInTempDir } from "./helpers/run-in-tmp";
 
 jest.unmock("undici");
 
-describe("unstable_dev", () => {
+describe.skip("unstable_dev", () => {
 	it("should return Hello World", async () => {
 		const worker = await unstable_dev(
-			"src/__tests__/helpers/hello-world-worker.js",
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
 			{},
 			{ disableExperimentalWarning: true }
 		);
@@ -19,12 +19,32 @@ describe("unstable_dev", () => {
 		}
 		await worker.stop();
 	});
+
+	it("should return the port that the server started on (1)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{},
+			{ disableExperimentalWarning: true }
+		);
+		expect(worker.port).toBeGreaterThan(0);
+		await worker.stop();
+	});
+
+	it("should return the port that the server started on (2)", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{ port: 9191 },
+			{ disableExperimentalWarning: true }
+		);
+		expect(worker.port).toBe(9191);
+		await worker.stop();
+	});
 });
 
 describe("unstable dev fetch input protocol", () => {
 	it("should use http localProtocol", async () => {
 		const worker = await unstable_dev(
-			"src/__tests__/helpers/hello-world-worker.js",
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
 			{ localProtocol: "http" },
 			{ disableExperimentalWarning: true }
 		);
@@ -38,7 +58,7 @@ describe("unstable dev fetch input protocol", () => {
 
 	it("should use undefined localProtocol", async () => {
 		const worker = await unstable_dev(
-			"src/__tests__/helpers/hello-world-worker.js",
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
 			{ localProtocol: undefined },
 			{ disableExperimentalWarning: true }
 		);

package/src/__tests__/api-devregistry.test.js

@@ -0,0 +1,56 @@
+import { unstable_dev } from "../api";
+import { fetch } from "undici";
+
+// jest.unmock("undici");
+
+/**
+ * a huge caveat to how testing multi-worker scripts works:
+ * you can't shutdown the first worker you spun up, or it'll kill the devRegistry
+ */
+describe.skip("multi-worker testing", () => {
+	let childWorker;
+	let parentWorker;
+
+	beforeAll(async () => {
+		childWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/hello-world-worker.js",
+			{ config: "src/__tests__/helpers/worker-scripts/child-wrangler.toml" },
+			{ disableExperimentalWarning: true }
+		);
+		parentWorker = await unstable_dev(
+			"src/__tests__/helpers/worker-scripts/parent-worker.js",
+			{ config: "src/__tests__/helpers/worker-scripts/parent-wrangler.toml" },
+			{ disableExperimentalWarning: true }
+		);
+	});
+
+	afterAll(async () => {
+		await childWorker.stop();
+		await parentWorker.stop();
+	});
+
+	it("parentWorker and childWorker should be added devRegistry", async () => {
+		const resp = await fetch("http://localhost:6284/workers");
+		if (resp) {
+			const parsedResp = await resp.json();
+			expect(parsedResp.parent).toBeTruthy();
+			expect(parsedResp.child).toBeTruthy();
+		}
+	});
+
+	it("childWorker should return Hello World itself", async () => {
+		const resp = await childWorker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+	});
+
+	it("parentWorker should return Hello World by invoking the child worker", async () => {
+		const resp = await parentWorker.fetch();
+		if (resp) {
+			const parsedResp = await resp.text();
+			expect(parsedResp).toEqual("Parent worker sees: Hello World!");
+		}
+	});
+});