@dxos/echo-query 0.8.4-main.ae835ea → 0.8.4-main.bc2380dfbc

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/README.md

@@ -18,4 +18,4 @@ pnpm i @dxos/echo-query
 
 Your ideas, issues, and code are most welcome. Please take a look at our [community code of conduct](https://github.com/dxos/dxos/blob/main/CODE_OF_CONDUCT.md), the [issue guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-issues), and the [PR contribution guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-prs).
 
-License: [MIT](./LICENSE) Copyright 2022 © DXOS
+License: [FSL-1.1-Apache-2.0](./LICENSE) Copyright 2022 © DXOS

package/dist/lib/{browser → neutral}/index.mjs

@@ -70,7 +70,7 @@ __export(query_terms_exports, {
   PropertyPath: () => PropertyPath,
   Query: () => Query,
   Relation: () => Relation,
-  String: () => String,
+  String: () => String2,
   Tag: () => Tag,
   TagFilter: () => TagFilter,
   TextFilter: () => TextFilter,
@@ -85,7 +85,7 @@ var Filter = 7;
 var TagFilter = 8;
 var Tag = 9;
 var TextFilter = 10;
-var String = 11;
+var String2 = 11;
 var TypeFilter = 12;
 var TypeKeyword = 13;
 var PropertyFilter = 15;
@@ -134,7 +134,7 @@ var QueryBuilder = class {
   */
   validate(input) {
     try {
-      const tree = this._parser.parse(input);
+      const tree = this._parser.parse(normalizeInput(input));
       return tree.cursor().node.name === "Query";
     } catch {
       return false;
@@ -145,8 +145,9 @@ var QueryBuilder = class {
   */
   build(input) {
     try {
-      const tree = this._parser.parse(input);
-      return this.buildQuery(tree, input);
+      const normalized = normalizeInput(input);
+      const tree = this._parser.parse(normalized);
+      return this.buildQuery(tree, normalized);
     } catch {
       return {};
     }
@@ -311,8 +312,9 @@ var QueryBuilder = class {
             const exprStart = cursor.from;
             let exprEnd = cursor.to;
             while (cursor.nextSibling() && depth > 0) {
-              if (cursor.node.name === "(") depth++;
-              else if (cursor.node.name === ")") {
+              if (cursor.node.name === "(") {
+                depth++;
+              } else if (cursor.node.name === ")") {
                 depth--;
                 if (depth === 0) {
                   exprEnd = cursor.from;
@@ -401,7 +403,7 @@ var QueryBuilder = class {
     cursor.firstChild();
     const text = this._getNodeText(cursor, input);
     cursor.parent();
-    return Filter2.text(text.slice(1, -1));
+    return Filter2.text(unescapeStringLiteral(text.slice(1, -1)));
   }
   /**
   * Parse an ObjectLiteral node.
@@ -488,15 +490,7 @@ var QueryBuilder = class {
   * Parse a TagFilter node (#tag).
   */
   _parseTagFilter(cursor, input) {
-    invariant(this._tags, void 0, {
-      F: __dxlog_file,
-      L: 468,
-      S: this,
-      A: [
-        "this._tags",
-        ""
-      ]
-    });
+    invariant(this._tags, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 400, S: this, A: ["this._tags", ""] });
     const str = this._getNodeText(cursor, input).slice(1).toLowerCase();
     const [key] = Object.entries(this._tags).find(([, value]) => value.label.toLowerCase() === str) ?? [];
     return key ? Filter2.tag(key) : void 0;
@@ -509,7 +503,7 @@ var QueryBuilder = class {
     switch (valueType) {
       case "String": {
         const str = this._getNodeText(cursor, input);
-        return str.slice(1, -1);
+        return unescapeStringLiteral(str.slice(1, -1));
       }
       case "Number":
         return Number(this._getNodeText(cursor, input));
@@ -556,8 +550,368 @@ var QueryBuilder = class {
     return input.slice(cursor.from, cursor.to);
   }
 };
+var KEYWORDS = /* @__PURE__ */ new Set([
+  "AND",
+  "OR",
+  "NOT"
+]);
+var VALUE_LITERALS = /* @__PURE__ */ new Set([
+  "true",
+  "false",
+  "null"
+]);
+var SPECIAL_CHARS = /[\s(){}\[\],"']/;
+var PROPERTY_KEY = /^[a-zA-Z_][a-zA-Z0-9_.]*$/;
+var NUMBER_LITERAL = /^-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
+var URL_SCHEMES = /* @__PURE__ */ new Set([
+  "http",
+  "https",
+  "ftp",
+  "ftps",
+  "file",
+  "mailto",
+  "tel",
+  "sms",
+  "data",
+  "javascript",
+  "ws",
+  "wss",
+  "ssh",
+  "git"
+]);
+var normalizeInput = (input) => {
+  const out = [];
+  let pos = 0;
+  while (pos < input.length) {
+    const currentChar = input[pos];
+    if (/\s/.test(currentChar)) {
+      out.push(currentChar);
+      pos++;
+      continue;
+    }
+    const prevChar = pos > 0 ? input[pos - 1] : "";
+    const isStringOpener = currentChar === '"' || currentChar === "'" && (pos === 0 || !/[a-zA-Z0-9_]/.test(prevChar));
+    if (isStringOpener) {
+      const quoteChar = currentChar;
+      let scanIndex2 = pos + 1;
+      while (scanIndex2 < input.length && input[scanIndex2] !== quoteChar) {
+        if (input[scanIndex2] === "\\" && scanIndex2 + 1 < input.length) {
+          scanIndex2 += 2;
+        } else {
+          scanIndex2++;
+        }
+      }
+      out.push(input.slice(pos, Math.min(scanIndex2 + 1, input.length)));
+      pos = scanIndex2 + 1;
+      continue;
+    }
+    if (currentChar === "{" || currentChar === "[") {
+      const closeChar = currentChar === "{" ? "}" : "]";
+      let depth = 1;
+      let scanIndex2 = pos + 1;
+      while (scanIndex2 < input.length && depth > 0) {
+        const innerChar = input[scanIndex2];
+        if (innerChar === '"' || innerChar === "'") {
+          const quoteChar = innerChar;
+          scanIndex2++;
+          while (scanIndex2 < input.length && input[scanIndex2] !== quoteChar) {
+            if (input[scanIndex2] === "\\" && scanIndex2 + 1 < input.length) {
+              scanIndex2 += 2;
+            } else {
+              scanIndex2++;
+            }
+          }
+          scanIndex2++;
+        } else if (innerChar === currentChar) {
+          depth++;
+          scanIndex2++;
+        } else if (innerChar === closeChar) {
+          depth--;
+          scanIndex2++;
+        } else {
+          scanIndex2++;
+        }
+      }
+      out.push(input.slice(pos, scanIndex2));
+      pos = scanIndex2;
+      continue;
+    }
+    if (currentChar === "(" || currentChar === ")" || currentChar === "=" || currentChar === "," || currentChar === "}" || currentChar === "]") {
+      out.push(currentChar);
+      pos++;
+      continue;
+    }
+    if (currentChar === "-" && input[pos + 1] === ">" || currentChar === "<" && input[pos + 1] === "-") {
+      out.push(input.slice(pos, pos + 2));
+      pos += 2;
+      continue;
+    }
+    if (currentChar === "!") {
+      out.push(currentChar);
+      pos++;
+      continue;
+    }
+    if (currentChar === "#") {
+      let scanIndex2 = pos + 1;
+      while (scanIndex2 < input.length && /[a-zA-Z0-9_-]/.test(input[scanIndex2])) {
+        scanIndex2++;
+      }
+      out.push(input.slice(pos, scanIndex2));
+      pos = scanIndex2;
+      continue;
+    }
+    let scanIndex = pos;
+    while (scanIndex < input.length) {
+      const innerChar = input[scanIndex];
+      if (innerChar === '"') {
+        break;
+      }
+      if (innerChar === "'" && scanIndex > pos && !/[a-zA-Z0-9_]/.test(input[scanIndex - 1])) {
+        break;
+      }
+      if (innerChar === "'" && scanIndex === pos) {
+        break;
+      }
+      if (innerChar !== "'" && SPECIAL_CHARS.test(innerChar)) {
+        break;
+      }
+      if (innerChar === "-" && input[scanIndex + 1] === ">") {
+        break;
+      }
+      if (innerChar === "<" && input[scanIndex + 1] === "-") {
+        break;
+      }
+      scanIndex++;
+    }
+    if (scanIndex === pos) {
+      out.push(currentChar);
+      pos++;
+      continue;
+    }
+    const token = input.slice(pos, scanIndex);
+    pos = scanIndex;
+    if (KEYWORDS.has(token.toUpperCase())) {
+      out.push(token);
+      continue;
+    }
+    const colonIdx = token.indexOf(":");
+    if (colonIdx > 0) {
+      const key = token.slice(0, colonIdx);
+      const rest = token.slice(colonIdx + 1);
+      if (key === "type") {
+        out.push(token);
+        continue;
+      }
+      const isUrlScheme = URL_SCHEMES.has(key.toLowerCase()) || rest.startsWith("//");
+      if (!isUrlScheme && PROPERTY_KEY.test(key)) {
+        if (rest.length === 0) {
+          out.push(token);
+          continue;
+        }
+        const firstValueChar = rest[0];
+        if (firstValueChar === '"' || firstValueChar === "'") {
+          out.push(token);
+          continue;
+        }
+        if (firstValueChar === "{" || firstValueChar === "[") {
+          out.push(token);
+          continue;
+        }
+        if (VALUE_LITERALS.has(rest) || NUMBER_LITERAL.test(rest)) {
+          out.push(token);
+          continue;
+        }
+        out.push(`${key}:"${escapeStringLiteral(rest)}"`);
+        continue;
+      }
+    }
+    if (PROPERTY_KEY.test(token)) {
+      let lookahead = pos;
+      while (lookahead < input.length && /\s/.test(input[lookahead])) {
+        lookahead++;
+      }
+      if (input[lookahead] === "=") {
+        out.push(token);
+        continue;
+      }
+    }
+    out.push(`"${escapeStringLiteral(token)}"`);
+  }
+  return out.join("");
+};
+var escapeStringLiteral = (value) => value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+var unescapeStringLiteral = (literalBody) => {
+  let out = "";
+  for (let i = 0; i < literalBody.length; i++) {
+    const ch = literalBody[i];
+    if (ch === "\\" && i + 1 < literalBody.length) {
+      out += literalBody[i + 1];
+      i++;
+    } else {
+      out += ch;
+    }
+  }
+  return out;
+};
+
+// src/sandbox/query-sandbox.ts
+import { Resource } from "@dxos/context";
+import { Query as Query2 } from "@dxos/echo";
+import { trim } from "@dxos/util";
+import { createQuickJS } from "@dxos/vendor-quickjs";
+import envCode from "#query-lite?raw";
+
+// src/sandbox/quickjs.ts
+var unwrapResult = (context, result) => {
+  if (result.error) {
+    const contextError = context.dump(result.error);
+    result.error.dispose();
+    if (typeof contextError === "object" && typeof contextError.name === "string" && typeof contextError.message === "string") {
+      const error = new Error(contextError.message);
+      Object.defineProperty(error, "name", {
+        value: contextError.name
+      });
+      const originalStack = error.stack;
+      error.stack = `${contextError.name}: ${contextError.message}
+${contextError.stack}${originalStack?.split("\n").slice(1).join("\n") ?? ""}`;
+      throw error;
+    } else {
+      throw new Error(String(contextError));
+    }
+  }
+  return result.value;
+};
+
+// src/sandbox/query-sandbox.ts
+function _ts_add_disposable_resource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
+  }
+  return value;
+}
+function _ts_dispose_resources(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources = function _ts_dispose_resources2(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
+        }
+      }
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
+    }
+    return next();
+  })(env);
+}
+var QuerySandbox = class _QuerySandbox extends Resource {
+  // Caching the wasm module.
+  static quickJS = null;
+  static getQuickJS() {
+    if (!_QuerySandbox.quickJS) {
+      _QuerySandbox.quickJS = createQuickJS();
+    }
+    return _QuerySandbox.quickJS;
+  }
+  #runtime;
+  async _open() {
+    const quickJS = await _QuerySandbox.getQuickJS();
+    this.#runtime = quickJS.newRuntime({
+      moduleLoader: (moduleName, _context) => {
+        switch (moduleName) {
+          case "dxos:query-lite":
+            return envCode;
+          default:
+            throw new Error(`Module not found: ${moduleName}`);
+        }
+      }
+    });
+  }
+  async _close() {
+    this.#runtime.dispose();
+  }
+  /**
+  * Evaluates the query code.
+  * @param queryCode Example: `Query.select(Filter.typename('org.dxos.type.person'))`
+  */
+  eval(queryCode) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
+    try {
+      const context = _ts_add_disposable_resource(env, this.#runtime.newContext(), false);
+      const globals = trim`
+      import { Filter, Order, Query } from 'dxos:query-lite';
+      globalThis.Filter = Filter;
+      globalThis.Order = Order;
+      globalThis.Query = Query;
+    `;
+      unwrapResult(context, context.evalCode(globals)).dispose();
+      const query = _ts_add_disposable_resource(env, unwrapResult(context, context.evalCode(queryCode)), false);
+      const result = context.dump(query);
+      if ("~Filter" in result) {
+        return Query2.select(result).ast;
+      } else {
+        return result.ast;
+      }
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
+    } finally {
+      _ts_dispose_resources(env);
+    }
+  }
+};
 export {
   QueryBuilder,
-  QueryDSL
+  QueryDSL,
+  QuerySandbox,
+  normalizeInput
 };
 //# sourceMappingURL=index.mjs.map