@snowtop/ent 0.1.0-alpha9 → 0.1.0-alpha90

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 (116) hide show
  1. package/action/action.d.ts +36 -31
  2. package/action/action.js +2 -6
  3. package/action/executor.d.ts +3 -3
  4. package/action/executor.js +2 -2
  5. package/action/experimental_action.d.ts +29 -22
  6. package/action/experimental_action.js +29 -6
  7. package/action/orchestrator.d.ts +38 -16
  8. package/action/orchestrator.js +219 -61
  9. package/action/privacy.d.ts +2 -2
  10. package/core/base.d.ts +45 -24
  11. package/core/base.js +7 -1
  12. package/core/clause.d.ts +68 -7
  13. package/core/clause.js +291 -62
  14. package/core/config.d.ts +8 -0
  15. package/core/context.d.ts +5 -3
  16. package/core/context.js +20 -2
  17. package/core/convert.d.ts +1 -1
  18. package/core/db.d.ts +2 -2
  19. package/core/db.js +1 -1
  20. package/core/ent.d.ts +79 -24
  21. package/core/ent.js +520 -168
  22. package/core/loaders/assoc_count_loader.d.ts +2 -2
  23. package/core/loaders/assoc_count_loader.js +6 -1
  24. package/core/loaders/assoc_edge_loader.d.ts +2 -2
  25. package/core/loaders/index.d.ts +1 -1
  26. package/core/loaders/index.js +1 -3
  27. package/core/loaders/index_loader.d.ts +2 -2
  28. package/core/loaders/loader.js +5 -5
  29. package/core/loaders/object_loader.d.ts +6 -5
  30. package/core/loaders/object_loader.js +62 -58
  31. package/core/loaders/query_loader.d.ts +6 -12
  32. package/core/loaders/query_loader.js +47 -10
  33. package/core/loaders/raw_count_loader.d.ts +2 -2
  34. package/core/logger.d.ts +1 -1
  35. package/core/logger.js +1 -0
  36. package/core/privacy.d.ts +26 -25
  37. package/core/privacy.js +21 -25
  38. package/core/query/assoc_query.d.ts +6 -6
  39. package/core/query/custom_clause_query.d.ts +24 -0
  40. package/core/query/custom_clause_query.js +72 -0
  41. package/core/query/custom_query.d.ts +20 -5
  42. package/core/query/custom_query.js +77 -10
  43. package/core/query/index.d.ts +1 -0
  44. package/core/query/index.js +3 -1
  45. package/core/query/query.d.ts +1 -1
  46. package/core/query/query.js +8 -1
  47. package/core/query/shared_assoc_test.d.ts +1 -1
  48. package/core/query/shared_assoc_test.js +17 -5
  49. package/core/query/shared_test.d.ts +3 -0
  50. package/core/query/shared_test.js +211 -30
  51. package/core/viewer.d.ts +3 -3
  52. package/core/viewer.js +1 -1
  53. package/graphql/graphql.js +6 -0
  54. package/graphql/query/edge_connection.d.ts +9 -9
  55. package/graphql/query/page_info.d.ts +1 -1
  56. package/index.d.ts +11 -5
  57. package/index.js +15 -6
  58. package/package.json +1 -1
  59. package/parse_schema/parse.d.ts +12 -3
  60. package/parse_schema/parse.js +70 -11
  61. package/schema/base_schema.js +3 -0
  62. package/schema/field.d.ts +44 -8
  63. package/schema/field.js +125 -9
  64. package/schema/index.d.ts +2 -2
  65. package/schema/json_field.d.ts +13 -1
  66. package/schema/json_field.js +28 -1
  67. package/schema/schema.d.ts +65 -11
  68. package/schema/schema.js +18 -4
  69. package/schema/struct_field.d.ts +11 -1
  70. package/schema/struct_field.js +44 -5
  71. package/scripts/custom_graphql.js +8 -3
  72. package/scripts/{transform_schema.d.ts → migrate_v0.1.d.ts} +0 -0
  73. package/scripts/migrate_v0.1.js +36 -0
  74. package/scripts/read_schema.js +15 -4
  75. package/testutils/builder.d.ts +31 -21
  76. package/testutils/builder.js +83 -29
  77. package/testutils/db/fixture.d.ts +10 -0
  78. package/testutils/db/fixture.js +26 -0
  79. package/testutils/db/{test_db.d.ts → temp_db.d.ts} +15 -3
  80. package/testutils/db/{test_db.js → temp_db.js} +70 -16
  81. package/testutils/db/value.d.ts +6 -0
  82. package/testutils/db/value.js +251 -0
  83. package/testutils/db_time_zone.d.ts +4 -0
  84. package/testutils/db_time_zone.js +41 -0
  85. package/testutils/fake_data/fake_contact.d.ts +5 -4
  86. package/testutils/fake_data/fake_contact.js +14 -6
  87. package/testutils/fake_data/fake_event.d.ts +5 -3
  88. package/testutils/fake_data/fake_event.js +8 -5
  89. package/testutils/fake_data/fake_user.d.ts +4 -4
  90. package/testutils/fake_data/fake_user.js +16 -13
  91. package/testutils/fake_data/test_helpers.d.ts +3 -2
  92. package/testutils/fake_data/test_helpers.js +8 -6
  93. package/testutils/fake_data/user_query.d.ts +8 -6
  94. package/testutils/fake_data/user_query.js +28 -21
  95. package/testutils/fake_log.d.ts +3 -3
  96. package/testutils/parse_sql.d.ts +6 -0
  97. package/testutils/parse_sql.js +16 -2
  98. package/testutils/test_edge_global_schema.d.ts +15 -0
  99. package/testutils/test_edge_global_schema.js +58 -0
  100. package/testutils/write.d.ts +2 -2
  101. package/testutils/write.js +29 -7
  102. package/tsc/ast.d.ts +44 -0
  103. package/tsc/ast.js +267 -0
  104. package/tsc/compilerOptions.d.ts +6 -0
  105. package/tsc/compilerOptions.js +40 -1
  106. package/tsc/move_generated.d.ts +1 -0
  107. package/tsc/move_generated.js +160 -0
  108. package/tsc/transform.d.ts +21 -0
  109. package/tsc/transform.js +167 -0
  110. package/tsc/transform_action.d.ts +22 -0
  111. package/tsc/transform_action.js +179 -0
  112. package/tsc/transform_ent.d.ts +17 -0
  113. package/tsc/transform_ent.js +59 -0
  114. package/tsc/transform_schema.d.ts +27 -0
  115. package/tsc/transform_schema.js +379 -0
  116. package/scripts/transform_schema.js +0 -445
@@ -5,7 +5,6 @@ import * as clause from "../../core/clause";
5
5
  import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
6
6
  import { FakeUser, FakeEvent, FakeContact, EventToAttendeesQuery, EventToDeclinedQuery, EventToHostsQuery, EventToInvitedQuery, EventToMaybeQuery } from "./internal";
7
7
  import { RawCountLoaderFactory } from "../../core/loaders/raw_count_loader";
8
- import { IndexLoaderFactory } from "../../core/loaders/index_loader";
9
8
  import { QueryLoaderFactory } from "../../core/loaders/query_loader";
10
9
  export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, FakeContact, AssocEdge> {
11
10
  constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
@@ -13,7 +12,12 @@ export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, Fa
13
12
  sourceEnt(id: ID): Promise<FakeUser | null>;
14
13
  }
15
14
  export declare const userToContactsCountLoaderFactory: RawCountLoaderFactory;
16
- export declare const userToContactsDataLoaderFactory: IndexLoaderFactory;
15
+ export declare const userToContactsDataLoaderFactory: QueryLoaderFactory<unknown>;
16
+ export declare class UserToContactsFkeyQueryDeprecated extends CustomEdgeQueryBase<FakeUser, FakeContact> {
17
+ constructor(viewer: Viewer, src: ID | FakeUser);
18
+ static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQueryDeprecated;
19
+ sourceEnt(id: ID): Promise<FakeUser | null>;
20
+ }
17
21
  export declare class UserToContactsFkeyQuery extends CustomEdgeQueryBase<FakeUser, FakeContact> {
18
22
  constructor(viewer: Viewer, src: ID | FakeUser);
19
23
  static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQuery;
@@ -53,7 +57,7 @@ export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUs
53
57
  }
54
58
  export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
55
59
  constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
56
- getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
60
+ getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
57
61
  sourceEnt(id: ID): Promise<FakeUser | null>;
58
62
  static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>): UserToIncomingFriendRequestsQuery;
59
63
  queryContacts(): UserToContactsQuery;
@@ -84,13 +88,11 @@ export declare class UserToHostedEventsQuery extends AssocEdgeQueryBase<FakeUser
84
88
  }
85
89
  export declare const getNextWeekClause: () => clause.Clause;
86
90
  export declare function getCompleteClause(id: ID): clause.Clause;
87
- export declare const userToEventsInNextWeekCountLoaderFactory: RawCountLoaderFactory;
88
- export declare const userToEventsInNextWeekDataLoaderFactory: QueryLoaderFactory<unknown>;
89
91
  export declare class UserToEventsInNextWeekQuery extends CustomEdgeQueryBase<FakeUser, FakeEvent> {
90
92
  constructor(viewer: Viewer, src: ID | FakeUser);
91
93
  static query(viewer: Viewer, src: FakeUser | ID): UserToEventsInNextWeekQuery;
92
94
  sourceEnt(id: ID): Promise<FakeUser | null>;
93
- getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
95
+ getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
94
96
  }
95
97
  export declare class UserToFollowingQuery extends AssocEdgeQueryBase<FakeUser, Ent, AssocEdge> {
96
98
  constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
19
19
  return result;
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
- exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.userToEventsInNextWeekDataLoaderFactory = exports.userToEventsInNextWeekCountLoaderFactory = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQuery = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
22
+ exports.UserToFollowingQuery = exports.UserToEventsInNextWeekQuery = exports.getCompleteClause = exports.getNextWeekClause = exports.UserToHostedEventsQuery = exports.UserToEventsAttendingQuery = exports.UserToIncomingFriendRequestsQuery = exports.UserToFriendRequestsQuery = exports.UserToCustomEdgeQuery = exports.CustomEdge = exports.UserToFriendsQuery = exports.UserToContactsFkeyQuery = exports.UserToContactsFkeyQueryDeprecated = exports.userToContactsDataLoaderFactory = exports.userToContactsCountLoaderFactory = exports.UserToContactsQuery = void 0;
23
23
  const custom_query_1 = require("../../core/query/custom_query");
24
24
  const ent_1 = require("../../core/ent");
25
25
  const clause = __importStar(require("../../core/clause"));
@@ -28,7 +28,6 @@ const internal_1 = require("./internal");
28
28
  const raw_count_loader_1 = require("../../core/loaders/raw_count_loader");
29
29
  const assoc_count_loader_1 = require("../../core/loaders/assoc_count_loader");
30
30
  const assoc_edge_loader_1 = require("../../core/loaders/assoc_edge_loader");
31
- const index_loader_1 = require("../../core/loaders/index_loader");
32
31
  const fake_contact_1 = require("./fake_contact");
33
32
  const jest_date_mock_1 = require("jest-date-mock");
34
33
  const luxon_1 = require("luxon");
@@ -52,10 +51,12 @@ exports.userToContactsCountLoaderFactory = new raw_count_loader_1.RawCountLoader
52
51
  ...internal_1.FakeContact.loaderOptions(),
53
52
  groupCol: "user_id",
54
53
  });
55
- exports.userToContactsDataLoaderFactory = new index_loader_1.IndexLoaderFactory(internal_1.FakeContact.loaderOptions(), "user_id", {
54
+ exports.userToContactsDataLoaderFactory = new query_loader_1.QueryLoaderFactory({
55
+ ...internal_1.FakeContact.loaderOptions(),
56
+ groupCol: "user_id",
56
57
  toPrime: [fake_contact_1.contactLoader],
57
58
  });
58
- class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
59
+ class UserToContactsFkeyQueryDeprecated extends custom_query_1.CustomEdgeQueryBase {
59
60
  constructor(viewer, src) {
60
61
  super(viewer, {
61
62
  src,
@@ -65,6 +66,24 @@ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
65
66
  options: internal_1.FakeContact.loaderOptions(),
66
67
  });
67
68
  }
69
+ static query(viewer, src) {
70
+ return new UserToContactsFkeyQueryDeprecated(viewer, src);
71
+ }
72
+ sourceEnt(id) {
73
+ return internal_1.FakeUser.load(this.viewer, id);
74
+ }
75
+ }
76
+ exports.UserToContactsFkeyQueryDeprecated = UserToContactsFkeyQueryDeprecated;
77
+ // this replaces UserToContactsFkeyQueryDeprecated
78
+ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
79
+ constructor(viewer, src) {
80
+ super(viewer, {
81
+ src,
82
+ loadEntOptions: internal_1.FakeContact.loaderOptions(),
83
+ groupCol: "user_id",
84
+ name: "user_to_contacts",
85
+ });
86
+ }
68
87
  static query(viewer, src) {
69
88
  return new UserToContactsFkeyQuery(viewer, src);
70
89
  }
@@ -257,27 +276,15 @@ function getCompleteClause(id) {
257
276
  return clause.And(clause.Eq("user_id", id), (0, exports.getNextWeekClause)());
258
277
  }
259
278
  exports.getCompleteClause = getCompleteClause;
260
- exports.userToEventsInNextWeekCountLoaderFactory = new raw_count_loader_1.RawCountLoaderFactory({
261
- ...internal_1.FakeEvent.loaderOptions(),
262
- groupCol: "user_id",
263
- clause: (0, exports.getNextWeekClause)(),
264
- });
265
- exports.userToEventsInNextWeekDataLoaderFactory = new query_loader_1.QueryLoaderFactory({
266
- ...internal_1.FakeEvent.loaderOptions(),
267
- groupCol: "user_id",
268
- clause: (0, exports.getNextWeekClause)(),
269
- toPrime: [fake_contact_1.contactLoader],
270
- sortColumn: "start_time",
271
- });
272
279
  class UserToEventsInNextWeekQuery extends custom_query_1.CustomEdgeQueryBase {
273
280
  constructor(viewer, src) {
274
281
  super(viewer, {
275
282
  src,
276
- // we want to reuse this and not create a new one every time...
277
- countLoaderFactory: exports.userToEventsInNextWeekCountLoaderFactory,
278
- dataLoaderFactory: exports.userToEventsInNextWeekDataLoaderFactory,
279
- options: internal_1.FakeEvent.loaderOptions(),
280
- // hmm TODO shouldn't need to write this twice...
283
+ ...internal_1.FakeEvent.loaderOptions(),
284
+ groupCol: "user_id",
285
+ clause: (0, exports.getNextWeekClause)(),
286
+ loadEntOptions: internal_1.FakeEvent.loaderOptions(),
287
+ name: "events_in_next_week",
281
288
  sortColumn: "start_time",
282
289
  });
283
290
  }
@@ -1,4 +1,4 @@
1
- import { Ent } from "../core/base";
1
+ import { Ent, Viewer } from "../core/base";
2
2
  import { Builder } from "./../action";
3
3
  export declare class FakeLogger {
4
4
  private static logs;
@@ -8,6 +8,6 @@ export declare class FakeLogger {
8
8
  static contains(line: string): boolean;
9
9
  static clear(): void;
10
10
  }
11
- export declare class EntCreationObserver<T extends Ent> {
12
- observe(builder: Builder<T>): Promise<void>;
11
+ export declare class EntCreationObserver<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer> {
12
+ observe(builder: Builder<TEnt, TViewer>): Promise<void>;
13
13
  }
@@ -9,6 +9,12 @@ export declare class EqOp {
9
9
  constructor(col: string, value: any);
10
10
  apply(data: Data): boolean;
11
11
  }
12
+ export declare class NotEqOp {
13
+ private col;
14
+ private value;
15
+ constructor(col: string, value: any);
16
+ apply(data: Data): boolean;
17
+ }
12
18
  export declare class GreaterOp {
13
19
  private col;
14
20
  private value;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.performQuery = exports.OrOp = exports.AndOp = exports.InOp = exports.LessEqOp = exports.GreaterEqOp = exports.LessOp = exports.GreaterOp = exports.EqOp = exports.getDataToReturn = void 0;
3
+ exports.performQuery = exports.OrOp = exports.AndOp = exports.InOp = exports.LessEqOp = exports.GreaterEqOp = exports.LessOp = exports.GreaterOp = exports.NotEqOp = exports.EqOp = exports.getDataToReturn = void 0;
4
4
  const node_sql_parser_1 = require("node-sql-parser");
5
5
  function getTableName(table) {
6
6
  if (Array.isArray(table)) {
@@ -184,6 +184,16 @@ class EqOp {
184
184
  }
185
185
  }
186
186
  exports.EqOp = EqOp;
187
+ class NotEqOp {
188
+ constructor(col, value) {
189
+ this.col = col;
190
+ this.value = value;
191
+ }
192
+ apply(data) {
193
+ return data[this.col] !== this.value;
194
+ }
195
+ }
196
+ exports.NotEqOp = NotEqOp;
187
197
  class GreaterOp {
188
198
  constructor(col, value) {
189
199
  this.col = col;
@@ -307,8 +317,12 @@ function getOp(where, values) {
307
317
  return new AndOp([getOp(where.left, values), getOp(where.right, values)]);
308
318
  case "OR":
309
319
  return new OrOp([getOp(where.left, values), getOp(where.right, values)]);
320
+ case "IS":
321
+ return new EqOp(getColumnFromRef(where.left), where.right?.value);
322
+ case "IS NOT":
323
+ return new NotEqOp(getColumnFromRef(where.left), where.right?.value);
310
324
  default:
311
- console.log(where);
325
+ console.debug(where);
312
326
  throw new Error(`unsupported op ${where.operator}`);
313
327
  }
314
328
  }
@@ -0,0 +1,15 @@
1
+ import { EdgeUpdateOperation, TransformedEdgeUpdateOperation } from "../schema";
2
+ import * as clause from "../core/clause";
3
+ import { AssocEdge } from "../core/ent";
4
+ import { Data } from "../core/base";
5
+ export declare class EdgeWithDeletedAt extends AssocEdge {
6
+ deletedAt: Date | null;
7
+ constructor(data: Data);
8
+ }
9
+ export declare const testEdgeGlobalSchema: {
10
+ extraEdgeFields: {
11
+ deletedAt: import("../schema").TimestampField;
12
+ };
13
+ transformEdgeRead(): clause.Clause;
14
+ transformEdgeWrite(stmt: EdgeUpdateOperation): TransformedEdgeUpdateOperation | null;
15
+ };
@@ -0,0 +1,58 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
21
+ Object.defineProperty(exports, "__esModule", { value: true });
22
+ exports.testEdgeGlobalSchema = exports.EdgeWithDeletedAt = void 0;
23
+ const schema_1 = require("../schema");
24
+ const clause = __importStar(require("../core/clause"));
25
+ const ent_1 = require("../core/ent");
26
+ class EdgeWithDeletedAt extends ent_1.AssocEdge {
27
+ constructor(data) {
28
+ super(data);
29
+ this.deletedAt = data.deleted_at;
30
+ }
31
+ }
32
+ exports.EdgeWithDeletedAt = EdgeWithDeletedAt;
33
+ exports.testEdgeGlobalSchema = {
34
+ extraEdgeFields: {
35
+ // need this to be lowerCamelCase because we do this based on field name
36
+ // #510
37
+ deletedAt: (0, schema_1.TimestampType)({
38
+ nullable: true,
39
+ index: true,
40
+ defaultValueOnCreate: () => null,
41
+ }),
42
+ },
43
+ transformEdgeRead() {
44
+ return clause.Eq("deleted_at", null);
45
+ },
46
+ transformEdgeWrite(stmt) {
47
+ switch (stmt.op) {
48
+ case schema_1.SQLStatementOperation.Delete:
49
+ return {
50
+ op: schema_1.SQLStatementOperation.Update,
51
+ data: {
52
+ deleted_at: new Date(),
53
+ },
54
+ };
55
+ }
56
+ return null;
57
+ },
58
+ };
@@ -1,5 +1,5 @@
1
- import { EditRowOptions, Data, ID, DataOptions, CreateRowOptions } from "../core/base";
1
+ import { EditRowOptions, Data, DataOptions, CreateRowOptions } from "../core/base";
2
2
  import * as clause from "../core/clause";
3
3
  export declare function createRowForTest(options: CreateRowOptions, suffix?: string): Promise<Data | null>;
4
- export declare function editRowForTest(options: EditRowOptions, id: ID, suffix?: string): Promise<Data | null>;
4
+ export declare function editRowForTest(options: EditRowOptions, suffix?: string): Promise<Data | null>;
5
5
  export declare function deleteRowsForTest(options: DataOptions, cls: clause.Clause): Promise<void>;
@@ -1,16 +1,38 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
4
20
  };
5
21
  Object.defineProperty(exports, "__esModule", { value: true });
6
22
  exports.deleteRowsForTest = exports.editRowForTest = exports.createRowForTest = void 0;
7
23
  const ent_1 = require("../core/ent");
8
- const db_1 = __importDefault(require("../core/db"));
24
+ const db_1 = __importStar(require("../core/db"));
9
25
  function isSyncClient(client) {
10
26
  return client.execSync !== undefined;
11
27
  }
12
28
  async function createRowForTest(options, suffix) {
13
- const client = await db_1.default.getInstance().getNewClient();
29
+ let client;
30
+ if (db_1.Dialect.SQLite === db_1.default.getDialect()) {
31
+ client = db_1.default.getInstance().getSQLiteClient();
32
+ }
33
+ else {
34
+ client = await db_1.default.getInstance().getNewClient();
35
+ }
14
36
  try {
15
37
  if (isSyncClient(client)) {
16
38
  return (0, ent_1.createRowSync)(client, options, suffix || "");
@@ -22,13 +44,13 @@ async function createRowForTest(options, suffix) {
22
44
  }
23
45
  }
24
46
  exports.createRowForTest = createRowForTest;
25
- async function editRowForTest(options, id, suffix) {
47
+ async function editRowForTest(options, suffix) {
26
48
  const client = await db_1.default.getInstance().getNewClient();
27
49
  try {
28
50
  if (isSyncClient(client)) {
29
- return (0, ent_1.editRowSync)(client, options, id, suffix || "");
51
+ return (0, ent_1.editRowSync)(client, options, suffix || "");
30
52
  }
31
- return await (0, ent_1.editRow)(client, options, id, suffix);
53
+ return await (0, ent_1.editRow)(client, options, suffix);
32
54
  }
33
55
  finally {
34
56
  client.release();
package/tsc/ast.d.ts ADDED
@@ -0,0 +1,44 @@
1
+ import ts from "typescript";
2
+ export declare function getPreText(fileContents: string, node: ts.Node, sourceFile: ts.SourceFile): string;
3
+ export interface ClassInfo {
4
+ extends?: string;
5
+ comment: string;
6
+ name: string;
7
+ export?: boolean;
8
+ default?: boolean;
9
+ implements?: string[];
10
+ wrapClassContents(inner: string): string;
11
+ }
12
+ export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
13
+ declare type transformImportFn = (imp: string) => string;
14
+ interface transformOpts {
15
+ removeImports?: string[];
16
+ newImports?: string[];
17
+ transform?: transformImportFn;
18
+ transformPath: string;
19
+ }
20
+ export declare function transformImport(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, opts: transformOpts): string | undefined;
21
+ export declare function updateImportPath(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, newPath: string): string | undefined;
22
+ export declare function isRelativeImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
23
+ export declare function isRelativeGeneratedImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
24
+ export declare function isSrcGeneratedImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
25
+ interface importInfo {
26
+ imports: string[];
27
+ start: number;
28
+ end: number;
29
+ importText: string;
30
+ importPath: string;
31
+ default?: string;
32
+ }
33
+ export declare function getImportInfo(imp: ts.ImportDeclaration, sourceFile: ts.SourceFile): importInfo | undefined;
34
+ export declare function transformRelative(file: string, importPath: string, relative?: boolean): string;
35
+ export interface customInfo {
36
+ viewerInfo: {
37
+ path: string;
38
+ name: string;
39
+ };
40
+ relativeImports?: boolean;
41
+ globalSchemaPath?: string;
42
+ }
43
+ export declare function getCustomInfo(): customInfo;
44
+ export {};
package/tsc/ast.js ADDED
@@ -0,0 +1,267 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
10
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
11
+ }) : function(o, v) {
12
+ o["default"] = v;
13
+ });
14
+ var __importStar = (this && this.__importStar) || function (mod) {
15
+ if (mod && mod.__esModule) return mod;
16
+ var result = {};
17
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
18
+ __setModuleDefault(result, mod);
19
+ return result;
20
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.getCustomInfo = exports.transformRelative = exports.getImportInfo = exports.isSrcGeneratedImport = exports.isRelativeGeneratedImport = exports.isRelativeImport = exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
26
+ const typescript_1 = __importDefault(require("typescript"));
27
+ const path = __importStar(require("path"));
28
+ const js_yaml_1 = require("js-yaml");
29
+ const fs = __importStar(require("fs"));
30
+ function getPreText(fileContents, node, sourceFile) {
31
+ return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
32
+ }
33
+ exports.getPreText = getPreText;
34
+ function getClassInfo(fileContents, sourceFile, node) {
35
+ let className = node.name?.text;
36
+ let classExtends;
37
+ let impl = [];
38
+ if (node.heritageClauses) {
39
+ for (const hc of node.heritageClauses) {
40
+ switch (hc.token) {
41
+ case typescript_1.default.SyntaxKind.ImplementsKeyword:
42
+ for (const type of hc.types) {
43
+ impl.push(type.expression.getText(sourceFile));
44
+ }
45
+ break;
46
+ case typescript_1.default.SyntaxKind.ExtendsKeyword:
47
+ // can only extend one class
48
+ for (const type of hc.types) {
49
+ const text = type.expression.getText(sourceFile);
50
+ classExtends = text;
51
+ }
52
+ break;
53
+ }
54
+ }
55
+ }
56
+ if (!className) {
57
+ return undefined;
58
+ }
59
+ let hasExport = false;
60
+ let hasDefault = false;
61
+ let comment = getPreText(fileContents, node, sourceFile);
62
+ const wrapClassContents = (inner) => {
63
+ let ret = `${comment}`;
64
+ if (hasExport) {
65
+ ret += "export ";
66
+ }
67
+ if (hasDefault) {
68
+ ret += "default ";
69
+ }
70
+ ret += `class ${className} `;
71
+ if (classExtends) {
72
+ ret += `extends ${classExtends} `;
73
+ }
74
+ if (impl.length) {
75
+ ret += `implements ${impl.join(", ")}`;
76
+ }
77
+ return `${ret}{
78
+ ${inner}
79
+ }`;
80
+ };
81
+ if (node.modifiers) {
82
+ for (const mod of node.modifiers) {
83
+ const text = mod.getText(sourceFile);
84
+ if (text === "export") {
85
+ hasExport = true;
86
+ }
87
+ else if (text === "default") {
88
+ hasDefault = true;
89
+ }
90
+ }
91
+ }
92
+ return {
93
+ name: className,
94
+ extends: classExtends,
95
+ comment,
96
+ implements: impl,
97
+ wrapClassContents,
98
+ export: hasExport,
99
+ default: hasDefault,
100
+ };
101
+ }
102
+ exports.getClassInfo = getClassInfo;
103
+ function transformImport(fileContents, importNode, sourceFile, opts) {
104
+ // remove quotes too
105
+ const text = importNode.moduleSpecifier.getText(sourceFile).slice(1, -1);
106
+ if (text != opts.transformPath) {
107
+ return;
108
+ }
109
+ const impInfo = getImportInfo(importNode, sourceFile);
110
+ if (!impInfo) {
111
+ return;
112
+ }
113
+ let { imports, start, end, importText, default: def } = impInfo;
114
+ let removeImportsMap = {};
115
+ if (opts?.removeImports) {
116
+ opts.removeImports.forEach((imp) => {
117
+ removeImportsMap[imp] = true;
118
+ if (def === imp) {
119
+ def = "";
120
+ }
121
+ });
122
+ }
123
+ let finalImports = new Set();
124
+ for (let i = 0; i < imports.length; i++) {
125
+ let imp = imports[i].trim();
126
+ if (imp === "") {
127
+ continue;
128
+ }
129
+ if (opts?.transform) {
130
+ imp = opts.transform(imp);
131
+ }
132
+ if (removeImportsMap[imp]) {
133
+ continue;
134
+ }
135
+ finalImports.add(imp);
136
+ }
137
+ if (opts?.newImports) {
138
+ opts.newImports.forEach((imp) => finalImports.add(imp));
139
+ }
140
+ const comment = getPreText(fileContents, importNode, sourceFile);
141
+ return (comment +
142
+ "import " +
143
+ // add default
144
+ (def || "") +
145
+ // should probably always be "{" now that we support default
146
+ (start >= 0 ? importText.substring(0, start + 1) : "{") +
147
+ Array.from(finalImports).join(", ") +
148
+ // should probably always be "}"
149
+ (end >= 0 ? importText.substring(end) : "}") +
150
+ ' from "' +
151
+ text +
152
+ '";');
153
+ }
154
+ exports.transformImport = transformImport;
155
+ function updateImportPath(fileContents, importNode, sourceFile, newPath) {
156
+ const comment = getPreText(fileContents, importNode, sourceFile);
157
+ // all this copied from above...
158
+ const importText = importNode.importClause?.getText(sourceFile) || "";
159
+ const start = importText.indexOf("{");
160
+ const end = importText.lastIndexOf("}");
161
+ if (start === -1 || end === -1) {
162
+ return;
163
+ }
164
+ const imports = importText
165
+ .substring(start + 1, end)
166
+ // .trim()
167
+ .split(",");
168
+ return (comment +
169
+ "import " +
170
+ importText.substring(0, start + 1) +
171
+ Array.from(imports).join(", ") +
172
+ importText.substring(end) +
173
+ ' from "' +
174
+ newPath +
175
+ '";');
176
+ }
177
+ exports.updateImportPath = updateImportPath;
178
+ function isRelativeImport(node, sourceFile) {
179
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
180
+ return text.startsWith("..") || text.startsWith("./");
181
+ }
182
+ exports.isRelativeImport = isRelativeImport;
183
+ function isRelativeGeneratedImport(node, sourceFile) {
184
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
185
+ return ((text.startsWith("..") || text.startsWith("./")) &&
186
+ text.indexOf("/generated") !== -1);
187
+ }
188
+ exports.isRelativeGeneratedImport = isRelativeGeneratedImport;
189
+ function isSrcGeneratedImport(node, sourceFile) {
190
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
191
+ return text.startsWith("src") && text.includes("/generated");
192
+ }
193
+ exports.isSrcGeneratedImport = isSrcGeneratedImport;
194
+ // TODO doesn't support default + {} yet
195
+ function getImportInfo(imp, sourceFile) {
196
+ const importText = imp.importClause?.getText(sourceFile) || "";
197
+ const start = importText.indexOf("{");
198
+ const end = importText.lastIndexOf("}");
199
+ const text = imp.moduleSpecifier.getText(sourceFile).slice(1, -1);
200
+ if ((start === -1 || end === -1) && !importText.length) {
201
+ return;
202
+ }
203
+ let imports = [];
204
+ let def;
205
+ if (start !== -1 && end !== -1) {
206
+ imports = importText
207
+ .substring(start + 1, end)
208
+ //.trim()
209
+ .split(",");
210
+ }
211
+ else {
212
+ def = importText;
213
+ }
214
+ return {
215
+ importPath: text,
216
+ importText,
217
+ start,
218
+ end,
219
+ imports,
220
+ default: def,
221
+ };
222
+ }
223
+ exports.getImportInfo = getImportInfo;
224
+ function transformRelative(file, importPath, relative) {
225
+ if (!relative || !importPath.startsWith("src")) {
226
+ return importPath;
227
+ }
228
+ const fileFullPath = path.join(process.cwd(), file);
229
+ const impFullPath = path.join(process.cwd(), importPath);
230
+ // relative path is from directory
231
+ return normalizePath(path.relative(path.dirname(fileFullPath), impFullPath));
232
+ }
233
+ exports.transformRelative = transformRelative;
234
+ function normalizePath(p) {
235
+ if (p.endsWith("..")) {
236
+ return p + "/";
237
+ }
238
+ return p;
239
+ }
240
+ // also used in parse schema logic
241
+ function getCustomInfo() {
242
+ let yaml = {};
243
+ let relativeImports = false;
244
+ try {
245
+ yaml = (0, js_yaml_1.load)(fs.readFileSync(path.join(process.cwd(), "ent.yml"), {
246
+ encoding: "utf8",
247
+ }));
248
+ relativeImports = yaml?.codegen?.relativeImports || false;
249
+ if (yaml?.codegen?.templatizedViewer) {
250
+ return {
251
+ viewerInfo: yaml.codegen.templatizedViewer,
252
+ relativeImports,
253
+ globalSchemaPath: yaml.globalSchemaPath,
254
+ };
255
+ }
256
+ }
257
+ catch (e) { }
258
+ return {
259
+ viewerInfo: {
260
+ path: "@snowtop/ent",
261
+ name: "Viewer",
262
+ },
263
+ relativeImports,
264
+ globalSchemaPath: yaml.globalSchemaPath,
265
+ };
266
+ }
267
+ exports.getCustomInfo = getCustomInfo;
@@ -1,2 +1,8 @@
1
1
  import ts from "typescript";
2
2
  export declare function readCompilerOptions(filePath: string): ts.CompilerOptions;
3
+ export declare function getTarget(target?: string): ts.ScriptTarget;
4
+ export declare function getTargetFromCurrentDir(): ts.ScriptTarget;
5
+ export declare function createSourceFile(target: ts.ScriptTarget, file: string): {
6
+ contents: string;
7
+ sourceFile: ts.SourceFile;
8
+ };