@live-change/simple-query 0.9.138 → 0.9.141

package/LICENSE.md

@@ -0,0 +1,11 @@
+Copyright 2019-2024 Michał Łaszczewski
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -27,9 +27,9 @@ const channelMessagesWithUsersAndIdentificationByTime = query({ // definition
   code(props, { user, message, identification }) => {
     const { channel, ...range } = props
     message.time.inside(range)
-    message.channel.eq(channel)
-    user.id.eq(message.author)
-    identification.id.eq(user.id)
+    message.channel.eqals(channel)
+    user.id.equals(message.au thor)
+    identification.id.equals(user.id)
   }
 })
 ```

package/index.ts

@@ -0,0 +1,3 @@
+import queryFactory from "./query.js"
+
+export default queryFactory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/simple-query",
-  "version": "0.9.138",
+  "version": "0.9.141",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -30,5 +30,5 @@
     "typedoc-plugin-markdown": "^4.6.3",
     "typedoc-plugin-rename-defaults": "^0.7.3"
   },
-  "gitHead": "b1b605b7f1fa4fc3de4720afbb401e2cfff080cf"
+  "gitHead": "2e34ef5af52ba93eaeb317a8a062b898db0673b8"
 }

package/query.ts

@@ -0,0 +1,133 @@
+import type { 
+  PropertyDefinitionSpecification, ServiceDefinition, ServiceDefinitionSpecification,
+  ModelDefinition, ForeignModelDefinition
+} from "@live-change/framework"
+
+import { PropertyDefinition } from "@live-change/framework"
+
+interface QueryParameters {
+  [key: string]: any
+}
+
+interface QueryInputs {
+  [key: string]: QueryInput
+}
+
+type QueryCode = ((parameters: QueryParameters, inputs: QueryInputs) => any)
+
+interface QueryDefinitionSpecification {
+  name: string
+  properties: Record<string, PropertyDefinitionSpecification>
+  returns?: PropertyDefinitionSpecification,
+  code: QueryCode,
+  sourceName: string,
+  update: boolean,
+}
+
+export class QueryDefinition<SDS extends ServiceDefinitionSpecification> {
+
+  service: ServiceDefinition<SDS>
+  definition: QueryDefinitionSpecification
+  properties: Record<string, PropertyDefinition<any>>
+
+  constructor(serviceDefinition: ServiceDefinition<SDS>, definition: QueryDefinitionSpecification) {
+    this.service = serviceDefinition
+    this.definition = definition
+
+    this.properties = Object.fromEntries(
+      Object.entries(definition.properties)
+      .map(
+        ([propertyName, propertyDefinition]) => [propertyName, new PropertyDefinition(propertyDefinition)]
+      )
+    )
+
+    const queryProperties = {}
+    for(const propertyName in definition.properties) {
+      const propertyDefinition = definition.properties[propertyName]
+      const base = new QueryPropertyBase([propertyName])
+      queryProperties[propertyName] = createQueryPropertyProxy(base, propertyName, this.properties[propertyName])
+    }
+
+    const queryInputs = {}
+    for(const propertyName in definition.properties) {
+      const propertyDefinition = definition.properties[propertyName]
+      const base = new QueryInputBase(this, [propertyName])
+      queryInputs[propertyName] = createQueryInputProxy(base, propertyName, this.properties[propertyName])
+    }
+
+    // run the code to collect relations
+    this.definition.code(queryProperties, queryInputs)
+
+    /// TODO: use collected relations to create indexes and prepared query
+  }
+}
+
+
+export type QueryFactoryFunction<SDS extends ServiceDefinitionSpecification> = 
+  (definition: QueryDefinitionSpecification) => QueryDefinition<SDS>
+
+export default function queryFactory<SDS extends ServiceDefinitionSpecification>(
+    serviceDefinition: ServiceDefinition<SDS>
+  ) {
+  const queryFactoryFunction: QueryFactoryFunction<SDS> = 
+    (definition: QueryDefinitionSpecification) => new QueryDefinition<SDS>(serviceDefinition, definition)
+  return queryFactoryFunction
+}
+
+
+type QuerySource = ModelDefinition<any> | ForeignModelDefinition | any /// Query Definition will be recursive definition, so use any for now
+
+export class QueryInputBase {
+  $source: QuerySource
+  $path: string[]
+
+  constructor(source: QuerySource, path: string[]) {
+    this.$source = source
+    this.$path = path
+  }
+}
+
+export class QueryInput extends QueryInputBase {
+  [key: string]: QueryInputBase | any /// Proxy class will be added to this
+}
+
+
+export function createQueryInputProxy(
+  base: QueryInputBase, propertyName: string, propertyDefinition: PropertyDefinition<any>
+) {
+  return new Proxy(base, {
+    get(target, prop, receiver) {
+      const foundInBase = Reflect.get(target, prop, receiver)
+      if(foundInBase) return foundInBase
+      const propertyBase = new QueryInputBase(base.$source, [...base.$path, propertyName])
+      const propertyProxy = createQueryInputProxy(propertyBase, propertyName, propertyDefinition)
+      return propertyProxy
+    }
+  })
+}
+
+export class QueryPropertyBase {
+  $path: string[]
+
+  constructor(path: string[]) {
+    this.$path = path
+  }
+}
+
+export class QueryProperty extends QueryPropertyBase {
+  [key: string]: QueryPropertyBase | any /// Proxy class will be added to this
+}
+
+export function createQueryPropertyProxy(
+  base: QueryPropertyBase, propertyName: string, propertyDefinition: PropertyDefinition<any>
+) {
+  return new Proxy(base, {
+    get(target, prop, receiver) {
+      const foundInBase = Reflect.get(target, prop, receiver)
+      if(foundInBase) return foundInBase
+      const propertyBase = new QueryPropertyBase([...base.$path, propertyName])
+      const propertyProxy = createQueryPropertyProxy(propertyBase, propertyName, propertyDefinition)
+      return propertyProxy
+    }
+  })
+}

package/queryInputProxy.ts

@@ -0,0 +1,2 @@
+import type { QueryDefinition, QueryInputBase } from "./query.js"
+import type { PropertyDefinition } from "@live-change/framework"