remult 0.18.1-exp.5 → 0.18.1-exp.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/esm/src/data-providers/web-sql-data-provider.d.ts +1 -2
  2. package/esm/src/data-providers/web-sql-data-provider.js +1 -0
  3. package/esm/src/filter/filter-interfaces.d.ts +1 -1
  4. package/esm/src/remult3/RepositoryImplementation.d.ts +0 -1
  5. package/esm/src/remult3/RepositoryImplementation.js +1 -6
  6. package/esm/src/shared-tests/db-tests.db-tests.js +1 -1
  7. package/package.json +1 -1
  8. package/src/data-providers/web-sql-data-provider.d.ts +1 -2
  9. package/src/data-providers/web-sql-data-provider.js +1 -0
  10. package/src/filter/filter-interfaces.d.ts +1 -1
  11. package/src/remult3/RepositoryImplementation.d.ts +0 -1
  12. package/src/remult3/RepositoryImplementation.js +12 -20
  13. package/src/shared-tests/db-tests.db-tests.js +1 -1
package/esm/src/data-providers/web-sql-data-provider.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="websql" />
2
1
  import { __RowsOfDataForTesting } from "../__RowsOfDataForTesting";
3
2
  import { SqlCommand, SqlImplementation } from "../sql-command";
4
3
  import { EntityMetadata } from "../remult3";
@@ -9,7 +8,7 @@ export declare class WebSqlDataProvider implements SqlImplementation, __RowsOfDa
9
8
  [tableName: string]: any;
10
9
  };
11
10
  constructor(databaseName: string, databaseSize?: number);
12
- static getDb(remult?: Remult): Database;
11
+ static getDb(remult?: Remult): any;
13
12
  getLimitSqlSyntax(limit: number, offset: number): string;
14
13
  entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
15
14
  dropTable(entity: EntityMetadata): Promise<void>;
package/esm/src/data-providers/web-sql-data-provider.js CHANGED
@@ -8,6 +8,7 @@ export class WebSqlDataProvider {
8
8
  //@ts-ignore
9
9
  this.db = window.openDatabase(databaseName, '1.0', databaseName, databaseSize);
10
10
  }
11
+ // return instance of websql.Database class - see @types/websql
11
12
  static getDb(remult) {
12
13
  const sql = SqlDatabase.getDb(remult);
13
14
  const me = sql._getSourceSql();
package/esm/src/filter/filter-interfaces.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class Filter {
6
6
  constructor(apply?: (add: FilterConsumer) => void);
7
7
  __applyToConsumer(add: FilterConsumer): void;
8
8
  static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
9
- static createCustom<entityType>(rawFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
9
+ static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
10
10
  static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & rawFilterInfo<entityType>;
11
11
  static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
12
12
  toJson(): any;
package/esm/src/remult3/RepositoryImplementation.d.ts CHANGED
@@ -178,7 +178,6 @@ export declare class columnDefsImpl implements FieldMetadata {
178
178
  private settings;
179
179
  private entityDefs;
180
180
  constructor(settings: FieldOptions, entityDefs: EntityFullInfo<any>, remult: Remult);
181
- private _workingOnDbName;
182
181
  getDbName(): Promise<string>;
183
182
  options: FieldOptions<any, any>;
184
183
  target: ClassType<any>;
package/esm/src/remult3/RepositoryImplementation.js CHANGED
@@ -1163,7 +1163,6 @@ export class columnDefsImpl {
1163
1163
  constructor(settings, entityDefs, remult) {
1164
1164
  this.settings = settings;
1165
1165
  this.entityDefs = entityDefs;
1166
- this._workingOnDbName = false;
1167
1166
  this.options = this.settings;
1168
1167
  this.target = this.settings.target;
1169
1168
  this.valueConverter = this.settings.valueConverter;
@@ -1180,9 +1179,6 @@ export class columnDefsImpl {
1180
1179
  this.caption = buildCaption(settings.caption, settings.key, remult);
1181
1180
  }
1182
1181
  async getDbName() {
1183
- if (this._workingOnDbName)
1184
- return "Recursive getDbName call for field '" + this.key + "'. ";
1185
- this._workingOnDbName = true;
1186
1182
  try {
1187
1183
  if (this.settings.sqlExpression) {
1188
1184
  let result;
@@ -1198,7 +1194,6 @@ export class columnDefsImpl {
1198
1194
  return this.settings.dbName;
1199
1195
  }
1200
1196
  finally {
1201
- this._workingOnDbName = false;
1202
1197
  }
1203
1198
  }
1204
1199
  get dbName() {
@@ -1413,7 +1408,7 @@ export function ValueListFieldType(...options) {
1413
1408
  return (type) => {
1414
1409
  FieldType(o => {
1415
1410
  o.valueConverter = ValueListInfo.get(type),
1416
- o.displayValue = (item, val) => val.caption;
1411
+ o.displayValue = (item, val) => val?.caption;
1417
1412
  }, ...options)(type);
1418
1413
  };
1419
1414
  }
package/esm/src/shared-tests/db-tests.db-tests.js CHANGED
@@ -538,7 +538,7 @@ let testFilter = class testFilter {
538
538
  this.c = '';
539
539
  }
540
540
  };
541
- testFilter.search = Filter.createCustom((remult, str) => ({
541
+ testFilter.search = Filter.createCustom((str, remult) => ({
542
542
  $and: [{
543
543
  $or: [
544
544
  { a: 'a' },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "remult",
3
- "version": "0.18.1-exp.5",
3
+ "version": "0.18.1-exp.7",
4
4
  "description": "A CRUD framework for full-stack TypeScript",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
package/src/data-providers/web-sql-data-provider.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="websql" />
2
1
  import { __RowsOfDataForTesting } from "../__RowsOfDataForTesting";
3
2
  import { SqlCommand, SqlImplementation } from "../sql-command";
4
3
  import { EntityMetadata } from "../remult3";
@@ -9,7 +8,7 @@ export declare class WebSqlDataProvider implements SqlImplementation, __RowsOfDa
9
8
  [tableName: string]: any;
10
9
  };
11
10
  constructor(databaseName: string, databaseSize?: number);
12
- static getDb(remult?: Remult): Database;
11
+ static getDb(remult?: Remult): any;
13
12
  getLimitSqlSyntax(limit: number, offset: number): string;
14
13
  entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
15
14
  dropTable(entity: EntityMetadata): Promise<void>;
package/src/data-providers/web-sql-data-provider.js CHANGED
@@ -13,6 +13,7 @@ var WebSqlDataProvider = /** @class */ (function () {
13
13
  //@ts-ignore
14
14
  this.db = window.openDatabase(databaseName, '1.0', databaseName, databaseSize);
15
15
  }
16
+ // return instance of websql.Database class - see @types/websql
16
17
  WebSqlDataProvider.getDb = function (remult) {
17
18
  var sql = sql_database_1.SqlDatabase.getDb(remult);
18
19
  var me = sql._getSourceSql();
package/src/filter/filter-interfaces.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare class Filter {
6
6
  constructor(apply?: (add: FilterConsumer) => void);
7
7
  __applyToConsumer(add: FilterConsumer): void;
8
8
  static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
9
- static createCustom<entityType>(rawFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
9
+ static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
10
10
  static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & rawFilterInfo<entityType>;
11
11
  static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
12
12
  toJson(): any;
package/src/remult3/RepositoryImplementation.d.ts CHANGED
@@ -178,7 +178,6 @@ export declare class columnDefsImpl implements FieldMetadata {
178
178
  private settings;
179
179
  private entityDefs;
180
180
  constructor(settings: FieldOptions, entityDefs: EntityFullInfo<any>, remult: Remult);
181
- private _workingOnDbName;
182
181
  getDbName(): Promise<string>;
183
182
  options: FieldOptions<any, any>;
184
183
  target: ClassType<any>;
package/src/remult3/RepositoryImplementation.js CHANGED
@@ -2084,7 +2084,6 @@ var columnDefsImpl = /** @class */ (function () {
2084
2084
  function columnDefsImpl(settings, entityDefs, remult) {
2085
2085
  this.settings = settings;
2086
2086
  this.entityDefs = entityDefs;
2087
- this._workingOnDbName = false;
2088
2087
  this.options = this.settings;
2089
2088
  this.target = this.settings.target;
2090
2089
  this.valueConverter = this.settings.valueConverter;
@@ -2106,31 +2105,24 @@ var columnDefsImpl = /** @class */ (function () {
2106
2105
  return tslib_1.__generator(this, function (_a) {
2107
2106
  switch (_a.label) {
2108
2107
  case 0:
2109
- if (this._workingOnDbName)
2110
- return [2 /*return*/, "Recursive getDbName call for field '" + this.key + "'. "];
2111
- this._workingOnDbName = true;
2112
- _a.label = 1;
2113
- case 1:
2114
- _a.trys.push([1, , 6, 7]);
2115
- if (!this.settings.sqlExpression) return [3 /*break*/, 5];
2108
+ _a.trys.push([0, , 5, 6]);
2109
+ if (!this.settings.sqlExpression) return [3 /*break*/, 4];
2116
2110
  result = void 0;
2117
- if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 3];
2111
+ if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 2];
2118
2112
  return [4 /*yield*/, this.settings.sqlExpression(this.entityDefs)];
2119
- case 2:
2113
+ case 1:
2120
2114
  result = _a.sent();
2121
- return [3 /*break*/, 4];
2122
- case 3:
2115
+ return [3 /*break*/, 3];
2116
+ case 2:
2123
2117
  result = this.settings.sqlExpression;
2124
- _a.label = 4;
2125
- case 4:
2118
+ _a.label = 3;
2119
+ case 3:
2126
2120
  if (!result)
2127
2121
  return [2 /*return*/, this.settings.dbName];
2128
2122
  return [2 /*return*/, result];
2129
- case 5: return [2 /*return*/, this.settings.dbName];
2130
- case 6:
2131
- this._workingOnDbName = false;
2132
- return [7 /*endfinally*/];
2133
- case 7: return [2 /*return*/];
2123
+ case 4: return [2 /*return*/, this.settings.dbName];
2124
+ case 5: return [7 /*endfinally*/];
2125
+ case 6: return [2 /*return*/];
2134
2126
  }
2135
2127
  });
2136
2128
  });
@@ -2456,7 +2448,7 @@ function ValueListFieldType() {
2456
2448
  return function (type) {
2457
2449
  FieldType.apply(void 0, tslib_1.__spread([function (o) {
2458
2450
  o.valueConverter = ValueListInfo.get(type),
2459
- o.displayValue = function (item, val) { return val.caption; };
2451
+ o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; };
2460
2452
  }], options))(type);
2461
2453
  };
2462
2454
  }
package/src/shared-tests/db-tests.db-tests.js CHANGED
@@ -1367,7 +1367,7 @@ var testFilter = /** @class */ (function () {
1367
1367
  this.b = '';
1368
1368
  this.c = '';
1369
1369
  }
1370
- testFilter.search = filter_interfaces_1.Filter.createCustom(function (remult, str) { return ({
1370
+ testFilter.search = filter_interfaces_1.Filter.createCustom(function (str, remult) { return ({
1371
1371
  $and: [{
1372
1372
  $or: [
1373
1373
  { a: 'a' },