Comparing version 1.0.58 to 1.0.60
export declare const orma_introspect: (db: string, fn: (s: string[]) => Promise<Record<string, unknown>[][]>) => Promise<import("./introspector/introspector").orma_schema>; | ||
export declare const orma_query: <Schema extends import("./types/schema_types").DeepReadonlyObject<import("./introspector/introspector").orma_schema>, Query extends import("./types/query/query_types").OrmaQuery<Schema>>(raw_query: Query, orma_schema_input: Schema, query_function: (sql_string: string[]) => Promise<Record<string, unknown>[][]>, escaping_function: (value: any) => any, validation_function: (query: any) => any[]) => Promise<(import("./types/query/query_result_types").StripKeywords<import("./types/query/query_result_types").WrapInArrays<import("./types/query/query_result_types").AddSchemaTypes<Schema, Query, unknown>>> & { | ||
export declare const orma_query: <Schema extends import("./types/schema_types").DeepReadonlyObject<import("./introspector/introspector").orma_schema>, Query extends import("./types/query/query_types").OrmaQuery<Schema>>(raw_query: Query, orma_schema_input: Schema, query_function: (sql_string: string[]) => Promise<Record<string, unknown>[][]>, validation_function: (query: any) => any[]) => Promise<(import("./types/query/query_result_types").StripKeywords<import("./types/query/query_result_types").WrapInArrays<import("./types/query/query_result_types").AddSchemaTypes<Schema, Query, unknown>>> & { | ||
$success: true; | ||
@@ -4,0 +4,0 @@ }) | { |
@@ -1,1 +0,1 @@ | ||
export declare const apply_escape_macro: (query: any, escaping_function: (value: any) => any) => void; | ||
export declare const apply_escape_macro: (query: any) => void; |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.apply_escape_macro = void 0; | ||
const escape_1 = require("../../helpers/escape"); | ||
const helpers_1 = require("../../helpers/helpers"); | ||
const apply_escape_macro = (query, escaping_function) => { | ||
const apply_escape_macro = (query) => { | ||
let raw_paths = []; | ||
@@ -21,5 +22,5 @@ (0, helpers_1.deep_for_each)(query, (value, path) => { | ||
} | ||
(0, helpers_1.deep_set)(path, escaping_function(value.$escape), query); | ||
(0, helpers_1.deep_set)(path, (0, escape_1.orma_escape)(value.$escape), query); | ||
}); | ||
}; | ||
exports.apply_escape_macro = apply_escape_macro; |
@@ -23,13 +23,3 @@ "use strict"; | ||
}; | ||
(0, escaping_macros_1.apply_escape_macro)(query, value => { | ||
if (typeof value === 'string') { | ||
return `"${value}"`; | ||
} | ||
else if (value instanceof Date) { | ||
return `"2021-01-02"`; | ||
} | ||
else { | ||
return value; | ||
} | ||
}); | ||
(0, escaping_macros_1.apply_escape_macro)(query); | ||
(0, chai_1.expect)(query).to.deep.equal({ | ||
@@ -50,10 +40,3 @@ my_products: { | ||
}; | ||
(0, escaping_macros_1.apply_escape_macro)(query, value => { | ||
if (Array.isArray(value)) { | ||
return value; | ||
} | ||
else { | ||
return `"${value}"`; | ||
} | ||
}); | ||
(0, escaping_macros_1.apply_escape_macro)(query); | ||
(0, chai_1.expect)(query).to.deep.equal({ | ||
@@ -60,0 +43,0 @@ in: ['column', ['"val"']], |
@@ -10,3 +10,3 @@ import { error_type } from '../helpers/error_handling'; | ||
export declare const orma_nester: (results: [string[], Record<string, unknown>[]][], query: any, orma_schema: orma_schema) => {}; | ||
export declare const orma_query: <Schema extends import("../types/schema_types").DeepReadonlyObject<orma_schema>, Query extends OrmaQuery<Schema>>(raw_query: Query, orma_schema_input: Schema, query_function: (sql_string: string[]) => Promise<Record<string, unknown>[][]>, escaping_function: (value: any) => any, validation_function: (query: any) => any[]) => Promise<(import("../types/query/query_result_types").StripKeywords<import("../types/query/query_result_types").WrapInArrays<import("../types/query/query_result_types").AddSchemaTypes<Schema, Query, unknown>>> & { | ||
export declare const orma_query: <Schema extends import("../types/schema_types").DeepReadonlyObject<orma_schema>, Query extends OrmaQuery<Schema>>(raw_query: Query, orma_schema_input: Schema, query_function: (sql_string: string[]) => Promise<Record<string, unknown>[][]>, validation_function: (query: any) => any[]) => Promise<(import("../types/query/query_result_types").StripKeywords<import("../types/query/query_result_types").WrapInArrays<import("../types/query/query_result_types").AddSchemaTypes<Schema, Query, unknown>>> & { | ||
$success: true; | ||
@@ -13,0 +13,0 @@ }) | { |
@@ -96,3 +96,3 @@ "use strict"; | ||
// export const orma_query = async <schema>(raw_query: validate_query<schema>, orma_schema: validate_orma_schema<schema>, query_function: (sql_string: string) => Promise<Record<string, unknown>[]>) => { | ||
const orma_query = async (raw_query, orma_schema_input, query_function, escaping_function, validation_function) => { | ||
const orma_query = async (raw_query, orma_schema_input, query_function, validation_function) => { | ||
const query = (0, helpers_1.clone)(raw_query); // clone query so we can apply macros without mutating the actual input query | ||
@@ -124,3 +124,3 @@ const orma_schema = orma_schema_input; // this is just because the codebase isnt properly typed | ||
const subquery = (0, helpers_1.deep_get)(path, query); | ||
(0, escaping_macros_1.apply_escape_macro)(subquery, escaping_function); | ||
(0, escaping_macros_1.apply_escape_macro)(subquery); | ||
return (0, json_sql_1.json_to_sql)(subquery); | ||
@@ -127,0 +127,0 @@ }); |
@@ -38,3 +38,3 @@ "use strict"; | ||
}); | ||
(0, __1.orma_query)(query, schema, async () => ({}), () => { }, () => []).then(result => { | ||
(0, __1.orma_query)(query, schema, async () => ({}), () => []).then(result => { | ||
if (result.$success) { | ||
@@ -41,0 +41,0 @@ result.my_products[0].id; |
{ | ||
"name": "orma", | ||
"version": "1.0.58", | ||
"version": "1.0.60", | ||
"description": "A declarative relational syncronous orm", | ||
@@ -5,0 +5,0 @@ "main": "build/index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
395505
10015