@snowtop/ent 0.1.0-alpha13 → 0.1.0-alpha130

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 (173) hide show
  1. package/action/action.d.ts +33 -29
  2. package/action/action.js +22 -7
  3. package/action/executor.d.ts +3 -3
  4. package/action/executor.js +8 -3
  5. package/action/experimental_action.d.ts +32 -22
  6. package/action/experimental_action.js +35 -9
  7. package/action/index.d.ts +2 -0
  8. package/action/index.js +7 -1
  9. package/action/orchestrator.d.ts +32 -15
  10. package/action/orchestrator.js +249 -53
  11. package/action/privacy.d.ts +2 -2
  12. package/action/relative_value.d.ts +47 -0
  13. package/action/relative_value.js +125 -0
  14. package/action/transaction.d.ts +10 -0
  15. package/action/transaction.js +23 -0
  16. package/auth/auth.d.ts +1 -1
  17. package/core/base.d.ts +61 -37
  18. package/core/base.js +7 -1
  19. package/core/clause.d.ts +85 -40
  20. package/core/clause.js +375 -64
  21. package/core/config.d.ts +12 -1
  22. package/core/config.js +7 -1
  23. package/core/const.d.ts +3 -0
  24. package/core/const.js +6 -0
  25. package/core/context.d.ts +6 -4
  26. package/core/context.js +20 -2
  27. package/core/convert.d.ts +1 -1
  28. package/core/date.js +1 -5
  29. package/core/db.d.ts +11 -8
  30. package/core/db.js +20 -8
  31. package/core/ent.d.ts +86 -30
  32. package/core/ent.js +626 -197
  33. package/core/global_schema.d.ts +7 -0
  34. package/core/global_schema.js +51 -0
  35. package/core/loaders/assoc_count_loader.d.ts +3 -2
  36. package/core/loaders/assoc_count_loader.js +10 -2
  37. package/core/loaders/assoc_edge_loader.d.ts +2 -2
  38. package/core/loaders/assoc_edge_loader.js +8 -11
  39. package/core/loaders/index.d.ts +1 -1
  40. package/core/loaders/index.js +1 -3
  41. package/core/loaders/index_loader.d.ts +3 -3
  42. package/core/loaders/loader.d.ts +2 -2
  43. package/core/loaders/loader.js +5 -5
  44. package/core/loaders/object_loader.d.ts +32 -11
  45. package/core/loaders/object_loader.js +225 -78
  46. package/core/loaders/query_loader.d.ts +7 -13
  47. package/core/loaders/query_loader.js +52 -11
  48. package/core/loaders/raw_count_loader.d.ts +2 -2
  49. package/core/loaders/raw_count_loader.js +5 -1
  50. package/core/logger.d.ts +1 -1
  51. package/core/logger.js +1 -0
  52. package/core/privacy.d.ts +25 -24
  53. package/core/privacy.js +21 -25
  54. package/core/query/assoc_query.d.ts +7 -6
  55. package/core/query/assoc_query.js +9 -1
  56. package/core/query/custom_clause_query.d.ts +27 -0
  57. package/core/query/custom_clause_query.js +84 -0
  58. package/core/query/custom_query.d.ts +20 -5
  59. package/core/query/custom_query.js +87 -12
  60. package/core/query/index.d.ts +1 -0
  61. package/core/query/index.js +3 -1
  62. package/core/query/query.d.ts +8 -4
  63. package/core/query/query.js +101 -53
  64. package/core/query/shared_assoc_test.d.ts +2 -1
  65. package/core/query/shared_assoc_test.js +35 -45
  66. package/core/query/shared_test.d.ts +8 -1
  67. package/core/query/shared_test.js +470 -236
  68. package/core/viewer.d.ts +3 -3
  69. package/core/viewer.js +1 -1
  70. package/graphql/graphql.d.ts +51 -19
  71. package/graphql/graphql.js +160 -136
  72. package/graphql/graphql_field_helpers.d.ts +7 -1
  73. package/graphql/graphql_field_helpers.js +21 -1
  74. package/graphql/index.d.ts +2 -2
  75. package/graphql/index.js +3 -5
  76. package/graphql/query/connection_type.d.ts +9 -9
  77. package/graphql/query/edge_connection.d.ts +9 -9
  78. package/graphql/query/page_info.d.ts +1 -1
  79. package/graphql/query/shared_assoc_test.js +1 -1
  80. package/graphql/query/shared_edge_connection.js +1 -19
  81. package/graphql/scalars/orderby_direction.d.ts +2 -0
  82. package/graphql/scalars/orderby_direction.js +15 -0
  83. package/imports/dataz/example1/_auth.js +128 -47
  84. package/imports/dataz/example1/_viewer.js +87 -39
  85. package/imports/index.d.ts +6 -1
  86. package/imports/index.js +19 -4
  87. package/index.d.ts +13 -5
  88. package/index.js +21 -7
  89. package/package.json +17 -17
  90. package/parse_schema/parse.d.ts +31 -9
  91. package/parse_schema/parse.js +155 -13
  92. package/schema/base_schema.d.ts +5 -3
  93. package/schema/base_schema.js +6 -0
  94. package/schema/field.d.ts +78 -21
  95. package/schema/field.js +231 -71
  96. package/schema/index.d.ts +2 -2
  97. package/schema/index.js +5 -1
  98. package/schema/json_field.d.ts +16 -4
  99. package/schema/json_field.js +32 -2
  100. package/schema/schema.d.ts +89 -19
  101. package/schema/schema.js +11 -13
  102. package/schema/struct_field.d.ts +15 -3
  103. package/schema/struct_field.js +117 -22
  104. package/schema/union_field.d.ts +1 -1
  105. package/scripts/custom_compiler.js +10 -6
  106. package/scripts/custom_graphql.js +128 -31
  107. package/scripts/migrate_v0.1.js +36 -0
  108. package/scripts/move_types.js +120 -0
  109. package/scripts/read_schema.js +20 -5
  110. package/testutils/action/complex_schemas.d.ts +69 -0
  111. package/testutils/action/complex_schemas.js +398 -0
  112. package/testutils/builder.d.ts +41 -47
  113. package/testutils/builder.js +76 -49
  114. package/testutils/db/fixture.d.ts +10 -0
  115. package/testutils/db/fixture.js +26 -0
  116. package/testutils/db/{test_db.d.ts → temp_db.d.ts} +24 -8
  117. package/testutils/db/{test_db.js → temp_db.js} +182 -45
  118. package/testutils/db/value.d.ts +7 -0
  119. package/testutils/db/value.js +251 -0
  120. package/testutils/db_mock.d.ts +16 -4
  121. package/testutils/db_mock.js +52 -7
  122. package/testutils/db_time_zone.d.ts +4 -0
  123. package/testutils/db_time_zone.js +41 -0
  124. package/testutils/ent-graphql-tests/index.d.ts +7 -1
  125. package/testutils/ent-graphql-tests/index.js +52 -23
  126. package/testutils/fake_comms.js +1 -1
  127. package/testutils/fake_data/const.d.ts +2 -1
  128. package/testutils/fake_data/const.js +3 -0
  129. package/testutils/fake_data/fake_contact.d.ts +7 -3
  130. package/testutils/fake_data/fake_contact.js +13 -7
  131. package/testutils/fake_data/fake_event.d.ts +4 -1
  132. package/testutils/fake_data/fake_event.js +7 -6
  133. package/testutils/fake_data/fake_tag.d.ts +36 -0
  134. package/testutils/fake_data/fake_tag.js +89 -0
  135. package/testutils/fake_data/fake_user.d.ts +8 -5
  136. package/testutils/fake_data/fake_user.js +16 -15
  137. package/testutils/fake_data/index.js +5 -1
  138. package/testutils/fake_data/internal.d.ts +2 -0
  139. package/testutils/fake_data/internal.js +7 -1
  140. package/testutils/fake_data/tag_query.d.ts +13 -0
  141. package/testutils/fake_data/tag_query.js +43 -0
  142. package/testutils/fake_data/test_helpers.d.ts +11 -4
  143. package/testutils/fake_data/test_helpers.js +28 -12
  144. package/testutils/fake_data/user_query.d.ts +13 -6
  145. package/testutils/fake_data/user_query.js +54 -22
  146. package/testutils/fake_log.d.ts +3 -3
  147. package/testutils/fake_log.js +1 -1
  148. package/testutils/parse_sql.d.ts +6 -0
  149. package/testutils/parse_sql.js +16 -2
  150. package/testutils/test_edge_global_schema.d.ts +15 -0
  151. package/testutils/test_edge_global_schema.js +62 -0
  152. package/testutils/write.d.ts +2 -2
  153. package/testutils/write.js +33 -7
  154. package/tsc/ast.d.ts +25 -2
  155. package/tsc/ast.js +141 -17
  156. package/tsc/compilerOptions.js +5 -1
  157. package/tsc/move_generated.d.ts +1 -0
  158. package/tsc/move_generated.js +164 -0
  159. package/tsc/transform.d.ts +22 -0
  160. package/tsc/transform.js +181 -0
  161. package/tsc/transform_action.d.ts +22 -0
  162. package/tsc/transform_action.js +183 -0
  163. package/tsc/transform_ent.d.ts +17 -0
  164. package/tsc/transform_ent.js +60 -0
  165. package/tsc/transform_schema.d.ts +27 -0
  166. package/{scripts → tsc}/transform_schema.js +146 -117
  167. package/graphql/enums.d.ts +0 -3
  168. package/graphql/enums.js +0 -25
  169. package/scripts/move_generated.js +0 -142
  170. package/scripts/transform_code.js +0 -113
  171. package/scripts/transform_schema.d.ts +0 -1
  172. /package/scripts/{move_generated.d.ts → migrate_v0.1.d.ts} +0 -0
  173. /package/scripts/{transform_code.d.ts → move_types.d.ts} +0 -0
@@ -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,62 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.testEdgeGlobalSchema = exports.EdgeWithDeletedAt = void 0;
27
+ const schema_1 = require("../schema");
28
+ const clause = __importStar(require("../core/clause"));
29
+ const ent_1 = require("../core/ent");
30
+ class EdgeWithDeletedAt extends ent_1.AssocEdge {
31
+ constructor(data) {
32
+ super(data);
33
+ this.deletedAt = data.deleted_at;
34
+ }
35
+ }
36
+ exports.EdgeWithDeletedAt = EdgeWithDeletedAt;
37
+ exports.testEdgeGlobalSchema = {
38
+ extraEdgeFields: {
39
+ // need this to be lowerCamelCase because we do this based on field name
40
+ // #510
41
+ deletedAt: (0, schema_1.TimestampType)({
42
+ nullable: true,
43
+ index: true,
44
+ defaultValueOnCreate: () => null,
45
+ }),
46
+ },
47
+ transformEdgeRead() {
48
+ return clause.Eq("deleted_at", null);
49
+ },
50
+ transformEdgeWrite(stmt) {
51
+ switch (stmt.op) {
52
+ case schema_1.SQLStatementOperation.Delete:
53
+ return {
54
+ op: schema_1.SQLStatementOperation.Update,
55
+ data: {
56
+ deleted_at: new Date(),
57
+ },
58
+ };
59
+ }
60
+ return null;
61
+ },
62
+ };
@@ -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,42 @@
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
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
4
24
  };
5
25
  Object.defineProperty(exports, "__esModule", { value: true });
6
26
  exports.deleteRowsForTest = exports.editRowForTest = exports.createRowForTest = void 0;
7
27
  const ent_1 = require("../core/ent");
8
- const db_1 = __importDefault(require("../core/db"));
28
+ const db_1 = __importStar(require("../core/db"));
9
29
  function isSyncClient(client) {
10
30
  return client.execSync !== undefined;
11
31
  }
12
32
  async function createRowForTest(options, suffix) {
13
- const client = await db_1.default.getInstance().getNewClient();
33
+ let client;
34
+ if (db_1.Dialect.SQLite === db_1.default.getDialect()) {
35
+ client = db_1.default.getInstance().getSQLiteClient();
36
+ }
37
+ else {
38
+ client = await db_1.default.getInstance().getNewClient();
39
+ }
14
40
  try {
15
41
  if (isSyncClient(client)) {
16
42
  return (0, ent_1.createRowSync)(client, options, suffix || "");
@@ -22,13 +48,13 @@ async function createRowForTest(options, suffix) {
22
48
  }
23
49
  }
24
50
  exports.createRowForTest = createRowForTest;
25
- async function editRowForTest(options, id, suffix) {
51
+ async function editRowForTest(options, suffix) {
26
52
  const client = await db_1.default.getInstance().getNewClient();
27
53
  try {
28
54
  if (isSyncClient(client)) {
29
- return (0, ent_1.editRowSync)(client, options, id, suffix || "");
55
+ return (0, ent_1.editRowSync)(client, options, suffix || "");
30
56
  }
31
- return await (0, ent_1.editRow)(client, options, id, suffix);
57
+ return await (0, ent_1.editRow)(client, options, suffix);
32
58
  }
33
59
  finally {
34
60
  client.release();
package/tsc/ast.d.ts CHANGED
@@ -10,12 +10,35 @@ export interface ClassInfo {
10
10
  wrapClassContents(inner: string): string;
11
11
  }
12
12
  export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
13
- declare type transformImportFn = (imp: string) => string;
13
+ type transformImportFn = (imp: string) => string;
14
14
  interface transformOpts {
15
15
  removeImports?: string[];
16
16
  newImports?: string[];
17
17
  transform?: transformImportFn;
18
+ transformPath: string;
18
19
  }
19
- export declare function transformImport(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, opts?: transformOpts): string | undefined;
20
+ export declare function transformImport(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, opts: transformOpts): string | undefined;
20
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;
21
44
  export {};
package/tsc/ast.js CHANGED
@@ -1,10 +1,37 @@
1
1
  "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
2
25
  var __importDefault = (this && this.__importDefault) || function (mod) {
3
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
27
  };
5
28
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
29
+ exports.getCustomInfo = exports.transformRelative = exports.getImportInfo = exports.isSrcGeneratedImport = exports.isRelativeGeneratedImport = exports.isRelativeImport = exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
7
30
  const typescript_1 = __importDefault(require("typescript"));
31
+ const path = __importStar(require("path"));
32
+ const js_yaml_1 = require("js-yaml");
33
+ const fs = __importStar(require("fs"));
34
+ const const_1 = require("../core/const");
8
35
  function getPreText(fileContents, node, sourceFile) {
9
36
  return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
10
37
  }
@@ -31,8 +58,7 @@ function getClassInfo(fileContents, sourceFile, node) {
31
58
  }
32
59
  }
33
60
  }
34
- // we probably still don't need all of this...
35
- if (!className || !node.heritageClauses || !classExtends) {
61
+ if (!className) {
36
62
  return undefined;
37
63
  }
38
64
  let hasExport = false;
@@ -82,24 +108,22 @@ exports.getClassInfo = getClassInfo;
82
108
  function transformImport(fileContents, importNode, sourceFile, opts) {
83
109
  // remove quotes too
84
110
  const text = importNode.moduleSpecifier.getText(sourceFile).slice(1, -1);
85
- if (text !== "@snowtop/ent" &&
86
- text !== "@snowtop/ent/schema" &&
87
- text !== "@snowtop/ent/schema/") {
111
+ if (text != opts.transformPath) {
88
112
  return;
89
113
  }
90
- const importText = importNode.importClause?.getText(sourceFile) || "";
91
- const start = importText.indexOf("{");
92
- const end = importText.lastIndexOf("}");
93
- if (start === -1 || end === -1) {
114
+ const impInfo = getImportInfo(importNode, sourceFile);
115
+ if (!impInfo) {
94
116
  return;
95
117
  }
96
- const imports = importText
97
- .substring(start + 1, end)
98
- // .trim()
99
- .split(",");
118
+ let { imports, start, end, importText, default: def } = impInfo;
100
119
  let removeImportsMap = {};
101
120
  if (opts?.removeImports) {
102
- opts.removeImports.forEach((imp) => (removeImportsMap[imp] = true));
121
+ opts.removeImports.forEach((imp) => {
122
+ removeImportsMap[imp] = true;
123
+ if (def === imp) {
124
+ def = "";
125
+ }
126
+ });
103
127
  }
104
128
  let finalImports = new Set();
105
129
  for (let i = 0; i < imports.length; i++) {
@@ -119,11 +143,18 @@ function transformImport(fileContents, importNode, sourceFile, opts) {
119
143
  opts.newImports.forEach((imp) => finalImports.add(imp));
120
144
  }
121
145
  const comment = getPreText(fileContents, importNode, sourceFile);
146
+ if (!finalImports.size) {
147
+ return;
148
+ }
122
149
  return (comment +
123
150
  "import " +
124
- importText.substring(0, start + 1) +
151
+ // add default
152
+ (def || "") +
153
+ // should probably always be "{" now that we support default
154
+ (start >= 0 ? importText.substring(0, start + 1) : "{") +
125
155
  Array.from(finalImports).join(", ") +
126
- importText.substring(end) +
156
+ // should probably always be "}"
157
+ (end >= 0 ? importText.substring(end) : "}") +
127
158
  ' from "' +
128
159
  text +
129
160
  '";');
@@ -152,3 +183,96 @@ function updateImportPath(fileContents, importNode, sourceFile, newPath) {
152
183
  '";');
153
184
  }
154
185
  exports.updateImportPath = updateImportPath;
186
+ function isRelativeImport(node, sourceFile) {
187
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
188
+ return text.startsWith("..") || text.startsWith("./");
189
+ }
190
+ exports.isRelativeImport = isRelativeImport;
191
+ function isRelativeGeneratedImport(node, sourceFile) {
192
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
193
+ return ((text.startsWith("..") || text.startsWith("./")) &&
194
+ text.indexOf("/generated") !== -1);
195
+ }
196
+ exports.isRelativeGeneratedImport = isRelativeGeneratedImport;
197
+ function isSrcGeneratedImport(node, sourceFile) {
198
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
199
+ return text.startsWith("src") && text.includes("/generated");
200
+ }
201
+ exports.isSrcGeneratedImport = isSrcGeneratedImport;
202
+ // TODO doesn't support default + {} yet
203
+ function getImportInfo(imp, sourceFile) {
204
+ const importText = imp.importClause?.getText(sourceFile) || "";
205
+ const start = importText.indexOf("{");
206
+ const end = importText.lastIndexOf("}");
207
+ const text = imp.moduleSpecifier.getText(sourceFile).slice(1, -1);
208
+ if ((start === -1 || end === -1) && !importText.length) {
209
+ return;
210
+ }
211
+ let imports = [];
212
+ let def;
213
+ if (start !== -1 && end !== -1) {
214
+ imports = importText
215
+ .substring(start + 1, end)
216
+ //.trim()
217
+ .split(",");
218
+ }
219
+ else {
220
+ def = importText;
221
+ }
222
+ return {
223
+ importPath: text,
224
+ importText,
225
+ start,
226
+ end,
227
+ imports,
228
+ default: def,
229
+ };
230
+ }
231
+ exports.getImportInfo = getImportInfo;
232
+ function transformRelative(file, importPath, relative) {
233
+ if (!relative || !importPath.startsWith("src")) {
234
+ return importPath;
235
+ }
236
+ const fileFullPath = path.join(process.cwd(), file);
237
+ const impFullPath = path.join(process.cwd(), importPath);
238
+ // relative path is from directory
239
+ return normalizePath(path.relative(path.dirname(fileFullPath), impFullPath));
240
+ }
241
+ exports.transformRelative = transformRelative;
242
+ function normalizePath(p) {
243
+ if (p.endsWith("..")) {
244
+ return p + "/";
245
+ }
246
+ if (!p.startsWith("..")) {
247
+ return "./" + p;
248
+ }
249
+ return p;
250
+ }
251
+ // also used in parse schema logic
252
+ function getCustomInfo() {
253
+ let yaml = {};
254
+ let relativeImports = false;
255
+ try {
256
+ yaml = (0, js_yaml_1.load)(fs.readFileSync(path.join(process.cwd(), "ent.yml"), {
257
+ encoding: "utf8",
258
+ }));
259
+ relativeImports = yaml?.codegen?.relativeImports || false;
260
+ if (yaml?.codegen?.templatizedViewer) {
261
+ return {
262
+ viewerInfo: yaml.codegen.templatizedViewer,
263
+ relativeImports,
264
+ globalSchemaPath: yaml.globalSchemaPath,
265
+ };
266
+ }
267
+ }
268
+ catch (e) { }
269
+ return {
270
+ viewerInfo: {
271
+ path: const_1.PACKAGE,
272
+ name: "Viewer",
273
+ },
274
+ relativeImports,
275
+ globalSchemaPath: yaml.globalSchemaPath,
276
+ };
277
+ }
278
+ exports.getCustomInfo = getCustomInfo;
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -0,0 +1 @@
1
+ export declare function moveGenerated(relativeImports: boolean): void;
@@ -0,0 +1,164 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __importDefault = (this && this.__importDefault) || function (mod) {
26
+ return (mod && mod.__esModule) ? mod : { "default": mod };
27
+ };
28
+ Object.defineProperty(exports, "__esModule", { value: true });
29
+ exports.moveGenerated = void 0;
30
+ const glob_1 = require("glob");
31
+ const path = __importStar(require("path"));
32
+ const fs = __importStar(require("fs"));
33
+ const typescript_1 = __importDefault(require("typescript"));
34
+ const ast_1 = require("./ast");
35
+ const transform_1 = require("./transform");
36
+ class MoveFiles {
37
+ constructor(globPath) {
38
+ this.globPath = globPath;
39
+ }
40
+ move() {
41
+ const files = glob_1.glob.sync(this.globPath);
42
+ moveFiles(files);
43
+ }
44
+ }
45
+ class TransformImports {
46
+ constructor(glob, prettierGlob, relativeImports, checkRelativeImportsValid) {
47
+ this.glob = glob;
48
+ this.prettierGlob = prettierGlob;
49
+ this.relativeImports = relativeImports;
50
+ this.checkRelativeImportsValid = checkRelativeImportsValid;
51
+ this.globOptions = {
52
+ ignore: ["node_modules/**"],
53
+ };
54
+ this.cwd = process.cwd();
55
+ }
56
+ traverseChild(sourceFile, contents, file, node) {
57
+ if (!typescript_1.default.isImportDeclaration(node)) {
58
+ return { node };
59
+ }
60
+ let dirPath = path.join(this.cwd, file, "..");
61
+ const newImportPath = this.getNewImportPath(node, file, sourceFile, dirPath);
62
+ if (!newImportPath) {
63
+ return { node };
64
+ }
65
+ const v = (0, ast_1.updateImportPath)(contents, node, sourceFile, newImportPath);
66
+ return {
67
+ traversed: true,
68
+ rawString: v,
69
+ };
70
+ }
71
+ getNewImportPath(node, file, sourceFile, dirPath) {
72
+ const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
73
+ // it's relative and has generated in there, continue
74
+ // do relative imports path regardless of if relative imports is on or not
75
+ if ((0, ast_1.isRelativeGeneratedImport)(node, sourceFile)) {
76
+ const oldPath = path.join(dirPath, text);
77
+ const relFromRoot = path.relative(".", oldPath);
78
+ const conv = transformPath(relFromRoot);
79
+ if (!conv || conv.newFile === relFromRoot) {
80
+ return;
81
+ }
82
+ return path.relative(dirPath, conv.newFile);
83
+ }
84
+ if (this.checkRelativeImportsValid && (0, ast_1.isRelativeImport)(node, sourceFile)) {
85
+ const parts = file.split(path.sep);
86
+ if (parts.length === 5 &&
87
+ parts.slice(0, 3).join(path.sep) ===
88
+ ["src", "graphql", "generated"].join(path.sep)) {
89
+ // we have custom graphql import paths
90
+ // src/graphql/generated/mutations|resolvers/foo_type.ts
91
+ // which used to be
92
+ // src/graphql/mutations|resolvers/generated/foo_type.ts
93
+ // we probably have a broken import.
94
+ // try and fix it...
95
+ let temp = parts[2];
96
+ parts[2] = parts[3];
97
+ parts[3] = temp;
98
+ const oldPath = parts.join(path.sep);
99
+ let oldDir = path.join(this.cwd, oldPath, "..");
100
+ let importPath = path.join(oldDir, text);
101
+ let exists = fs.statSync(importPath + ".ts", { throwIfNoEntry: false });
102
+ if (!exists) {
103
+ // doesn't exist. sadly has to be fixed manually. could theoretically also be a directory but we shouldn't have that
104
+ return;
105
+ }
106
+ return path.relative(dirPath, importPath);
107
+ }
108
+ }
109
+ // if relative imports, we done.
110
+ if (this.relativeImports) {
111
+ return;
112
+ }
113
+ // non relative, only transform src paths with generated
114
+ if ((0, ast_1.isSrcGeneratedImport)(node, sourceFile)) {
115
+ const conv = transformPath(text);
116
+ if (!conv || conv.newFile === text) {
117
+ return;
118
+ }
119
+ return conv.newFile;
120
+ }
121
+ return;
122
+ }
123
+ }
124
+ function transformPath(old) {
125
+ const parts = old.split(path.sep);
126
+ if (parts.length < 3) {
127
+ return;
128
+ }
129
+ const changedParts = parts
130
+ .slice(0, 2)
131
+ .concat("generated")
132
+ .concat(parts.slice(2).filter((v) => v !== "generated"));
133
+ const newFile = changedParts.join(path.sep);
134
+ return { changedParts, newFile };
135
+ }
136
+ function moveFiles(files) {
137
+ files.forEach((file) => {
138
+ const conv = transformPath(file);
139
+ if (!conv) {
140
+ return;
141
+ }
142
+ const { changedParts, newFile } = conv;
143
+ if (file === newFile) {
144
+ return;
145
+ }
146
+ // check if directory exists, if not, create recursive dir
147
+ const p = changedParts.slice(0, changedParts.length - 1).join(path.sep);
148
+ const statInfo = fs.statSync(p, { throwIfNoEntry: false });
149
+ if (!statInfo) {
150
+ fs.mkdirSync(p, {
151
+ recursive: true,
152
+ });
153
+ }
154
+ // move file to new location
155
+ fs.renameSync(file, newFile);
156
+ });
157
+ }
158
+ function moveGenerated(relativeImports) {
159
+ new MoveFiles("src/ent/**/generated/**/**.ts").move();
160
+ new MoveFiles("src/graphql/**/generated/**/**.ts").move();
161
+ (0, transform_1.transform)(new TransformImports("src/ent/**/*.ts", "src/ent/**/*.ts", relativeImports));
162
+ (0, transform_1.transform)(new TransformImports("src/graphql/**/*.ts", "src/graphql/**/*.ts", relativeImports, true));
163
+ }
164
+ exports.moveGenerated = moveGenerated;
@@ -0,0 +1,22 @@
1
+ import { IOptions } from "glob";
2
+ import ts from "typescript";
3
+ interface TraverseChildResponse {
4
+ node?: ts.Node;
5
+ rawString?: string;
6
+ traversed?: boolean;
7
+ imports?: Map<string, string[]>;
8
+ removeImports?: string[];
9
+ allowSeenImportsAdded?: boolean;
10
+ }
11
+ export interface TransformFile {
12
+ glob: string;
13
+ globOptions?: IOptions;
14
+ preprocessFile?: (contents: string, file: string, sourceFile: ts.SourceFile) => boolean;
15
+ traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): TraverseChildResponse | undefined;
16
+ filter?(files: string[]): string[];
17
+ fileToWrite?(file: string): string;
18
+ postProcess?(file: string): void;
19
+ prettierGlob?: string;
20
+ }
21
+ export declare function transform(transform: TransformFile): void;
22
+ export {};