couchbaselabs
diff --git a/‎modules/eventing/pages/eventing-advanced-keyspace-accessors.adoc‎
Lines changed: 7 additions & 3 deletions b/‎modules/eventing/pages/eventing-advanced-keyspace-accessors.adoc‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎modules/guides/pages/.javascript-udfs.adoc‎
Lines changed: 8 additions & 1 deletion b/‎modules/guides/pages/.javascript-udfs.adoc‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎modules/guides/partials/javascript-udfs/diagrams.adoc‎
Lines changed: 6 additions & 6 deletions b/‎modules/guides/partials/javascript-udfs/diagrams.adoc‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎modules/javascript-udfs/pages/.calling-javascript-from-n1ql.adoc‎
Lines changed: 1 addition & 1 deletion b/‎modules/javascript-udfs/pages/.calling-javascript-from-n1ql.adoc‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎modules/javascript-udfs/pages/.javascript-functions-with-couchbase.adoc‎
Lines changed: 123 additions & 12 deletions b/‎modules/javascript-udfs/pages/.javascript-functions-with-couchbase.adoc‎
Lines changed: 123 additions & 12 deletions
diff --git a/‎modules/javascript-udfs/partials/diagrams.adoc‎
Lines changed: 6 additions & 4 deletions b/‎modules/javascript-udfs/partials/diagrams.adoc‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎modules/javascript-udfs/partials/diagrams/javascript-scopes.puml‎
Lines changed: 1 addition & 1 deletion b/‎modules/javascript-udfs/partials/diagrams/javascript-scopes.puml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎modules/javascript-udfs/partials/javascript-udf-introduction.adoc‎
Lines changed: 6 additions & 17 deletions b/‎modules/javascript-udfs/partials/javascript-udf-introduction.adoc‎
Lines changed: 6 additions & 17 deletions
@@ -407,9 +407,7 @@ function OnUpdate(doc, meta) {
 [#advanced-touch-op]
 == Advanced TOUCH Operation
 
-ifeval::['{page-component-version}' == '7.6'] 
-_(Introduced in Couchbase Server 7.6)_ 
-endif::[]
+[.status]#Couchbase Server 7.6#
 
 `result = couchbase.touch(binding, meta)`
 
@@ -465,6 +463,8 @@ function OnUpdate(doc, meta) {
 [#advanced-subdoc-array-op-mutatein]
 == Sub-Document MUTATEIN Operation
 
+[.status]#Couchbase Server 7.6#
+
 `result = couchbase.mutateIn(binding, meta, subdoc_operation_array, options)`
 
 Sub-Document MUTATEIN operations let you modify only parts of a document instead of the entire document.
@@ -558,6 +558,8 @@ function OnUpdate(doc, meta, xattrs) {
 [#advanced-subdoc-array-op-lookupin]
 == Sub-Document LOOKUPIN Operation
 
+[.status]#Couchbase Server 7.6.2#
+
 `result = couchbase.lookupIn(binding, meta, subdoc_array, options)`
 
 Sub-Document LOOKUPIN operations let you search for a specific field in a document without having to search and retrieve the entire document.
@@ -704,6 +706,8 @@ function OnUpdate(doc, meta) {
 [#optional-params-recursion]
 === Optional `{ "self_recursion": true }` Parameter
 
+[.status]#Couchbase Server 7.6#
+
 You can use the optional fourth parameter `{ "self_recursion": true }` to prevent the suppression of recursive source bucket mutations and to process the mutations that you have just created.
 
 If you do not add `{ "self_recursion": true }` to your operation, all source bucket mutations are suppressed.
 
@@ -16,7 +16,14 @@ include::ROOT:partial$component-signpost.adoc[]
 
 == Introduction
 
-include::javascript-udfs:partial$javascript-udf-introduction.adoc[]
+{sqlpp} includes a large number of built-in operations and functions that cover every aspect of data manipulation.
+User-defined functions enable you to create your own extensions to the language.
+
+Using user-defined functions, you can:
+
+* Create reuseable, domain-specific functions for use in your applications.
+* Execute complex logic that may be difficult to do in {sqlpp}.
+* Migrate from RDBMS stored procedures.
 
 == User-Defined Functions with JavaScript
 
 
@@ -29,6 +29,12 @@ left to right direction
 
 actor "developer" as user
 
+frame "Create library and add first function" as cAndA {
+  [(1) Create library] as createLibrary
+  [(2) Add the JavaScript function to the library] as addFunction
+  createLibrary  --> addFunction
+}
+
 note top of cAndA #Ivory
   The library and the first function
   are usually added in the same step.
@@ -41,12 +47,6 @@ note right of cAndA #Ivory
   by users with access to a scope within a bucket.
 end note
 
-frame "Create library and add first function" as cAndA {
-  [(1) Create library] as createLibrary
-  [(2) Add the JavaScript function to the library] as addFunction
-  createLibrary  --> addFunction
-}
-
 user --> createLibrary
 [(3) Create {sqlpp} User-Defined Function] as createN1QL
 
 
@@ -1,4 +1,4 @@
-= Calling JavaScript from {sqlpp} User-Defined Functions
+= Calling JavaScript from {sqlpp}
 :description: Using a {sqlpp} User-Defined Function to call JavaScript functions.
 ifndef::flag-devex-javascript-udfs[]
 :page-embargo: EMBARGOED
 
@@ -1,9 +1,11 @@
-= JavaScript Functions with Couchbase
-:description: Writing Couchbase extension functions in the JavaScript Language.
+= JavaScript Functions for Query Reference
+:description: This reference guide describes how to write extension functions for {sqlpp} for Query using the JavaScript language.
 ifndef::flag-devex-javascript-udfs[]
 :page-embargo: EMBARGOED
 endif::flag-devex-javascript-udfs[]
+:page-topic-type: reference
 :page-toclevels: 2
+:keywords: library namespacing
 
 [abstract]
 {description}
@@ -12,43 +14,56 @@ endif::flag-devex-javascript-udfs[]
 
 include::partial$javascript-udf-introduction.adoc[]
 
+This reference includes details of external functions using JavaScript.
 
-If you want to learn how to create JavaScript function libraries using the administration console and/or the REST-API then take a look at the xref:guides:javascript-udfs.adoc[JavaScript UDF Guides].
+include::partial$libraries-and-scopes.adoc[]
+
+include::partial$sqlpp-managed-udfs.adoc[]
 
 == Added Constructs
 
-JavaScript functions in Couchbase support most of the language constructs available in https://en.wikipedia.org/wiki/ECMAScript[ECMAScript], though there are a number of restrictions related to the Couchbase environment.
+JavaScript functions in {sqlpp} for Query support most of the language constructs available in https://en.wikipedia.org/wiki/ECMAScript[ECMAScript], though there are a number of restrictions related to the Couchbase environment.
 There are also additions that have been made to the language for working specifically with Couchbase.
 
 === {sqlpp} Embedded Statements
 
 Top level {sqlpp} keywords, such as SELECT, UPDATE, INSERT and DELETE, are available as inline keywords in functions.
-Operations that return values such as SELECT are accessible through a returned iterable handle. 
+Operations that return values such as SELECT are accessible through a returned iterable handle.
 {sqlpp} Query results, via a SELECT, are streamed in batches to the iterable handle as the iteration progresses through the result set.
 
+.JavaScript code with embedded {sqlpp} statements
+====
 [source, javascript]
 ----
 include::example$select-airline-inline.js[]
 ----
+
 <1> The {sqlpp} is written directly into the JavaScript code without having to be used as part of a function call.
 You can even provide parameters that can be used in the {sqlpp} statement.
 <2> A standard JavaScript iterator is used to access the values returned from the {sqlpp} statement.
+====
 
-include::partial$libraries-and-scopes.adoc[leveloffset=+2]
+For more details, see xref:calling-n1ql-from-javascript.adoc[].
 
 == Unsupported Features
 
+The following features are not supported in JavaScript functions for Query.
+
 === Browser Extensions
 
-Because JavaScript UDF functions do not execute in the context of a browser, the extensions that browsers add to the core language, such as window methods, DOM events etc. are not available.
+Because JavaScript functions in {sqlpp} for Query do not execute in the context of a browser, the extensions that browsers add to the core language, such as window methods, DOM events, and so on, are not available.
 
 === Global State
-All variables  must be local to the function; global state is not permitted.
 
+All variables must be local to the function; global state is not permitted.
+
+.JavaScript code with global variable
+====
 [source, javascript]
 ----
 include::example$illegal-global-variable.js[]
 ----
+====
 
 Along with global state, global https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions[arrow functions] are not supported.
 Arrow functions local to individual JavaScript functions are supported.
@@ -57,11 +72,107 @@ Arrow functions local to individual JavaScript functions are supported.
 
 Logging using the `console.log(..)` function is not supported.
 
-In the rest of this section, you're going to look at the concepts behind JavaScript User-Defined Functions:
+== Restricted Features
 
-* xref:calling-javascript-from-n1ql.adoc[]
-* xref:calling-n1ql-from-javascript.adoc[]
-* xref:handling-errors-javascript-udf.adoc[]
+[.status]#Couchbase Server 7.6.2#
+
+The following features are restricted in JavaScript functions for Query in Couchbase Server 7.6.2 and later.
+
+=== Code Injection
+
+JavaScript constructs that may allow for code injection have been removed:
+
+* The `eval` symbol has been removed.
+* The `Function` construct has been removed.
+
+.JavaScript code with the `eval` symbol
+====
+The following example does not compile as it uses the `eval` symbol.
+
+[source,javascript]
+----
+function evaluate() {
+    var q = select jscode from <bucket> where meta().id = <docid>;
+    let iter = q[Symbol.iterator]();
+    let code = iter.next();
+    let result = eval(code);
+}
+----
+====
+
+.JavaScript code with the `Function` construct
+====
+The following example does not compile as it uses the `Function` construct.
+
+[source,javascript]
+----
+function dynamicfunction() {
+var q = select jscode from <bucket> where meta().id = <docid>;
+    let iter = q[Symbol.iterator]();
+    let code = iter.next();
+  return new Function("inject", code);
+}
+
+function evaluate() {
+    dynamicfunction();
+}
+----
+====
+
+=== Date Granularity
 
+The granularity of the `Date` object has been reduced to 1 second.
+This is to prevent a potential attacker from easily measuring the difference between a CPU cache miss and cache hit, hence taking advantage of side-channel attacks or speculative execution attacks.
 
+.JavaScript code with timestamp
+====
+The following example executes a {sqlpp} query to insert a document with a field containing the current timestamp.
+The timestamp is returned to the last second, rather than the most recent millisecond.
 
+[source,javascript]
+----
+function addOrder() {
+    let curr = Date.now();
+    N1QL('INSERT INTO orders VALUES (uuid(),{"time":'+ curr +'})')
+}
+----
+====
+
+.JavaScript code with date comparison
+====
+The following example simulates sleep by blocking execution by the number of milliseconds passed as a function parameter.
+Since the `Date.Now()` function does not return the current time with millisecond granularity, the function may not work as expected.
+
+[source,javascript]
+----
+function sleep(milliseconds) {
+  let init = Date.now();
+  let curr = null;
+  do {
+     curr = Date.now();
+   } while (curr - init < milliseconds);
+}
+----
+====
+
+== See Also
+
+.User-Defined Function Guides
+* xref:guides:javascript-udfs.adoc[]
+* xref:n1ql:n1ql-intro/sysinfo.adoc#sys-functions[Monitor Functions]
+
+.{sqlpp} User-Defined Function Commands
+* xref:n1ql:n1ql-language-reference/createfunction.adoc[]
+* xref:n1ql:n1ql-language-reference/explainfunction.adoc[]
+* xref:n1ql:n1ql-language-reference/execfunction.adoc[]
+* xref:n1ql:n1ql-language-reference/dropfunction.adoc[]
+* xref:n1ql:n1ql-language-reference/userfun.adoc[]
+
+.External Libraries
+* xref:tools:udfs-ui.adoc[]
+* xref:n1ql:n1ql-rest-api/functions.adoc[]
+
+.JavaScript Functions
+* xref:calling-javascript-from-n1ql.adoc[]
+* xref:calling-n1ql-from-javascript.adoc[]
+* xref:handling-errors-javascript-udf.adoc[]
@@ -2,35 +2,37 @@
 Previews the diagrams used in the JavaScript UDF section
 ////
 
+.Inline call sequence
 [plantuml, subs=attributes]
 ....
 include::diagrams/inline-call-sequence.puml[]
 ....
 
+.Transactions and iterators
 [plantuml, subs=attributes]
 ....
 include::diagrams/transactions-and-iterators.puml[]
 ....
 
-
+.Data transformation
 [plantuml, subs=attributes]
 ....
 include::diagrams/data-transformation.puml[]
 ....
 
-.Scopes for JavaScript Libraries
+.UDF scopes
 [plantuml, subs=attributes]
 ....
 include::diagrams/udf-scopes-diagram.puml[]
 ....
 
-.Using Multiple Scopes
+.Banking scope scenario
 [plantuml, subs=attributes]
 ....
 include::diagrams/banking-scope-scenario.puml[]
 ....
 
-.JavaScript UDFs Structure
+.JavaScript scopes
 [plantuml]
 ....
 include::diagrams/javascript-scopes.puml[]
 
@@ -1,6 +1,6 @@
 @startuml
 
-frame Cluster {
+frame Namespace {
 
     frame "global library" as globalLibrary #white {
 
 
@@ -1,19 +1,8 @@
-////
-This is a reusable abstract the covers the main selling points of UDFs for the JavaScript section.
-Shouldn't be too JavaScript specific.
-////
-{sqlpp} includes a large number of
-ifdef::flag-devex-query[]
-xref:n1ql:n1ql-language-reference/index.adoc[operations and generic functions]
-endif::flag-devex-query[]
-ifndef::flag-devex-query[]
-operations and generic functions
-endif::flag-devex-query[]
-that cover every aspect of data manipulation.
-In addition to the built-in functions, Couchbase also allows you to create your own extensions to the language.
+There are two types of user-defined function in {sqlpp} for Query:
 
-Using user-defined functions, you can:
+* [.term]#Inline functions# are defined using {sqlpp} expressions.
+They enable you to name and reuse complex or repetitive expressions, including subqueries, in order to simplify your queries.
 
-* Create reuseable, domain-specific functions for use in your applications.
-* Execute complex logic that may be difficult to do in {sqlpp}.
-* Migrate from RDBMS stored procedures.
+* [.term]#External functions# are defined using an external language.
+They enable you to create functions that may be difficult or impossible to define using built-in {sqlpp} expressions.
+The only supported language is JavaScript.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-= Calling JavaScript from {sqlpp} User-Defined Functions`
	`1`	`+= Calling JavaScript from {sqlpp}`
`2`	`2`	`:description: Using a {sqlpp} User-Defined Function to call JavaScript functions.`
`3`	`3`	`ifndef::flag-devex-javascript-udfs[]`
`4`	`4`	`:page-embargo: EMBARGOED`