@openrewrite/rewrite 8.50.0-20250419.101724 → 8.50.2
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.
- package/dist/src/rpc/request/install-recipes.d.ts +7 -2
- package/dist/src/rpc/request/install-recipes.d.ts.map +1 -1
- package/dist/src/rpc/request/install-recipes.js +44 -22
- package/dist/src/rpc/request/install-recipes.js.map +1 -1
- package/dist/src/rpc/rewrite-rpc.d.ts +2 -0
- package/dist/src/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/src/rpc/rewrite-rpc.js +5 -0
- package/dist/src/rpc/rewrite-rpc.js.map +1 -1
- package/package.json +2 -3
- package/src/rpc/request/install-recipes.ts +49 -23
- package/src/rpc/rewrite-rpc.ts +9 -0
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import * as rpc from "vscode-jsonrpc/node";
|
|
2
|
+
export type RecipeDependency = string | {
|
|
3
|
+
packageName: string;
|
|
4
|
+
version?: string;
|
|
5
|
+
};
|
|
2
6
|
export interface InstallRecipesResponse {
|
|
3
7
|
recipesInstalled: number;
|
|
4
8
|
}
|
|
5
9
|
export declare class InstallRecipes {
|
|
6
|
-
private readonly
|
|
7
|
-
|
|
10
|
+
private readonly recipeDependency;
|
|
11
|
+
private readonly installDir;
|
|
12
|
+
constructor(recipeDependency: RecipeDependency, installDir: string);
|
|
8
13
|
static handle(connection: rpc.MessageConnection): void;
|
|
9
14
|
}
|
|
10
15
|
//# sourceMappingURL=install-recipes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"install-recipes.d.ts","sourceRoot":"","sources":["../../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAM3C,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAElF,MAAM,WAAW,sBAAsB;IACnC,gBAAgB,EAAE,MAAM,CAAA;CAC3B;AAED,qBAAa,cAAc;IACX,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,gBAAgB,EAAE,gBAAgB,EAClC,UAAU,EAAE,MAAM;IAG/C,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,GAAG,IAAI;CAoDzD"}
|
|
@@ -45,36 +45,58 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
exports.InstallRecipes = void 0;
|
|
46
46
|
const rpc = __importStar(require("vscode-jsonrpc/node"));
|
|
47
47
|
const recipe_1 = require("../../recipe");
|
|
48
|
+
const path = __importStar(require("path"));
|
|
49
|
+
const fs = __importStar(require("fs"));
|
|
50
|
+
const child_process_1 = require("child_process");
|
|
48
51
|
class InstallRecipes {
|
|
49
|
-
constructor(
|
|
50
|
-
this.
|
|
52
|
+
constructor(recipeDependency, installDir) {
|
|
53
|
+
this.recipeDependency = recipeDependency;
|
|
54
|
+
this.installDir = installDir;
|
|
51
55
|
}
|
|
52
56
|
static handle(connection) {
|
|
53
57
|
connection.onRequest(new rpc.RequestType("InstallRecipes"), (request) => __awaiter(this, void 0, void 0, function* () {
|
|
58
|
+
const installDir = request.installDir;
|
|
54
59
|
try {
|
|
55
|
-
const
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
60
|
+
const allRecipes = recipe_1.RecipeRegistry.all;
|
|
61
|
+
const beforeInstall = allRecipes.size;
|
|
62
|
+
if (typeof request.recipeDependency === "object") {
|
|
63
|
+
if (!fs.existsSync(installDir)) {
|
|
64
|
+
fs.mkdirSync(installDir, { recursive: true });
|
|
65
|
+
fs.writeFileSync(path.join(installDir, "package.json"), `{"name": "please-work"}`);
|
|
66
|
+
}
|
|
67
|
+
const pkg = request.recipeDependency.packageName;
|
|
68
|
+
yield new Promise((resolve, reject) => {
|
|
69
|
+
const installer = (0, child_process_1.spawn)("npm", ["install", pkg], {
|
|
70
|
+
cwd: installDir
|
|
71
|
+
});
|
|
72
|
+
installer.stdout.on("data", (data) => {
|
|
73
|
+
console.log(data.toString());
|
|
74
|
+
});
|
|
75
|
+
installer.stderr.on("data", (data) => {
|
|
76
|
+
console.log(data.toString());
|
|
77
|
+
});
|
|
78
|
+
installer.on("error", reject);
|
|
79
|
+
installer.on("close", (exitCode) => {
|
|
80
|
+
if (exitCode === 0) {
|
|
81
|
+
resolve();
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
reject(new Error(`npm install exited with code ${exitCode}`));
|
|
85
|
+
}
|
|
86
|
+
});
|
|
61
87
|
});
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
const beforeInstall = recipe_1.RecipeRegistry.all.size;
|
|
73
|
-
import(request.recipeModule);
|
|
74
|
-
return { recipesInstalled: recipe_1.RecipeRegistry.all.size - beforeInstall };
|
|
88
|
+
const resolvedPath = require.resolve(path.join(installDir, "node_modules", pkg));
|
|
89
|
+
const recipeExports = require(resolvedPath);
|
|
90
|
+
console.debug("Loaded module exports: " + recipeExports);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
require(request.recipeDependency);
|
|
94
|
+
}
|
|
95
|
+
return { recipesInstalled: allRecipes.size - beforeInstall };
|
|
75
96
|
}
|
|
76
97
|
catch (error) {
|
|
77
|
-
|
|
98
|
+
console.log(error.stack);
|
|
99
|
+
throw new Error(`Failed to install or require module ${request.recipeDependency}: ${error === null || error === void 0 ? void 0 : error.message}`);
|
|
78
100
|
}
|
|
79
101
|
}));
|
|
80
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2C;AAC3C,yCAA4C;
|
|
1
|
+
{"version":3,"file":"install-recipes.js","sourceRoot":"","sources":["../../../../src/rpc/request/install-recipes.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Cursor, SourceFile, Tree } from "../tree";
|
|
|
3
3
|
import { Recipe, RecipeDescriptor } from "../recipe";
|
|
4
4
|
import { VisitResponse } from "./request";
|
|
5
5
|
import { ExecutionContext } from "../execution";
|
|
6
|
+
import { InstallRecipesResponse, RecipeDependency } from "./request/install-recipes";
|
|
6
7
|
export declare class RewriteRpc {
|
|
7
8
|
private readonly connection;
|
|
8
9
|
private readonly snowflake;
|
|
@@ -22,6 +23,7 @@ export declare class RewriteRpc {
|
|
|
22
23
|
visit(tree: Tree, visitorName: string, p: any, cursor?: Cursor): Promise<Tree>;
|
|
23
24
|
scan(tree: Tree, visitorName: string, p: any, cursor?: Cursor): Promise<VisitResponse>;
|
|
24
25
|
generate(remoteRecipeId: string, ctx: ExecutionContext): Promise<SourceFile[]>;
|
|
26
|
+
installRecipes(recipeModule: RecipeDependency, installDir?: string): Promise<InstallRecipesResponse>;
|
|
25
27
|
private localObject;
|
|
26
28
|
getCursorIds(cursor: Cursor | undefined): string[] | undefined;
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAoC,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AACnF,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEnD,OAAO,EAQH,aAAa,EAChB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAoC,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AACnF,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAEnD,OAAO,EAQH,aAAa,EAChB,MAAM,WAAW,CAAC;AAInB,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAiB,sBAAsB,EAAE,gBAAgB,EAAC,MAAM,2BAA2B,CAAC;AAEnG,qBAAa,UAAU;IAUP,OAAO,CAAC,QAAQ,CAAC,UAAU;IATvC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAE3C,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAa;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IAEnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+B;IAC7D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;gBAE7B,UAAU,GAAE,iBAGxC,EAAE,SAAS,GAAE,MAAW;IAmBzB,GAAG,IAAI,UAAU;IAKX,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAsBpC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAY3D,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAYxC,OAAO,IAAI,OAAO,CAAC,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,gBAAgB,CAAC,EAAE,CAAC;IAM3D,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;IASzD,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpF,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAUhF,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAYpF,cAAc,CAAC,YAAY,EAAE,gBAAgB,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAOpG,OAAO,CAAC,WAAW;IAUnB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS;CAgBjE"}
|
|
@@ -50,6 +50,7 @@ const request_1 = require("./request");
|
|
|
50
50
|
const queue_1 = require("./queue");
|
|
51
51
|
const codec_1 = require("./codec");
|
|
52
52
|
const recipe_1 = require("./recipe");
|
|
53
|
+
const install_recipes_1 = require("./request/install-recipes");
|
|
53
54
|
class RewriteRpc {
|
|
54
55
|
constructor(connection = rpc.createMessageConnection(new rpc.StreamMessageReader(process.stdin), new rpc.StreamMessageWriter(process.stdout)), batchSize = 10) {
|
|
55
56
|
this.connection = connection;
|
|
@@ -68,6 +69,7 @@ class RewriteRpc {
|
|
|
68
69
|
request_1.GetRecipes.handle(this.connection);
|
|
69
70
|
request_1.PrepareRecipe.handle(this.connection, preparedRecipes);
|
|
70
71
|
request_1.Print.handle(this.connection, getObject, getCursor);
|
|
72
|
+
install_recipes_1.InstallRecipes.handle(this.connection);
|
|
71
73
|
this.connection.listen();
|
|
72
74
|
}
|
|
73
75
|
end() {
|
|
@@ -149,6 +151,9 @@ class RewriteRpc {
|
|
|
149
151
|
return generated;
|
|
150
152
|
});
|
|
151
153
|
}
|
|
154
|
+
installRecipes(recipeModule, installDir) {
|
|
155
|
+
return this.connection.sendRequest(new rpc.RequestType("InstallRecipes"), new install_recipes_1.InstallRecipes(recipeModule, installDir || process.cwd()));
|
|
156
|
+
}
|
|
152
157
|
localObject(obj) {
|
|
153
158
|
let id = this.localObjectIds.get(obj);
|
|
154
159
|
if (!id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,yDAA2C;AAE3C,kCAAmF;AAEnF,gEAA0D;AAC1D,uCASmB;AACnB,mCAAuE;AACvE,mCAAkC;AAClC,qCAAmC;
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openrewrite/rewrite",
|
|
3
|
-
"version": "8.50.
|
|
3
|
+
"version": "8.50.2",
|
|
4
4
|
"license": "Moderne Source Available License",
|
|
5
5
|
"description": "OpenRewrite JavaScript.",
|
|
6
6
|
"homepage": "https://github.com/openrewrite/rewrite",
|
|
@@ -24,20 +24,19 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@akashrajpurohit/snowflake-id": "^2.0.0",
|
|
27
|
+
"@openrewrite/recipes-npm": "^0.1.1",
|
|
27
28
|
"@types/node": "^22.5.4",
|
|
28
29
|
"dedent": "^1.5.3",
|
|
29
30
|
"diff": "^7.0.0",
|
|
30
31
|
"immer": "^10.1.1",
|
|
31
32
|
"npm": "^11.3.0",
|
|
32
33
|
"typescript": "^5.6.2",
|
|
33
|
-
"uuid": "^10.0.0",
|
|
34
34
|
"vscode-jsonrpc": "^8.2.1"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@types/diff": "^5.2.2",
|
|
38
38
|
"@types/jest": "^29.5.13",
|
|
39
39
|
"@types/npm": "^7.19.3",
|
|
40
|
-
"@types/uuid": "^10.0.0",
|
|
41
40
|
"jest": "^29.7.0",
|
|
42
41
|
"ts-jest": "^29.2.5",
|
|
43
42
|
"ts-node": "^10.9.2"
|
|
@@ -1,43 +1,69 @@
|
|
|
1
1
|
import * as rpc from "vscode-jsonrpc/node";
|
|
2
2
|
import {RecipeRegistry} from "../../recipe";
|
|
3
|
+
import * as path from "path";
|
|
4
|
+
import * as fs from "fs";
|
|
5
|
+
import {spawn} from "child_process";
|
|
6
|
+
|
|
7
|
+
export type RecipeDependency = string | { packageName: string, version?: string };
|
|
3
8
|
|
|
4
9
|
export interface InstallRecipesResponse {
|
|
5
10
|
recipesInstalled: number
|
|
6
11
|
}
|
|
7
12
|
|
|
8
13
|
export class InstallRecipes {
|
|
9
|
-
constructor(private readonly
|
|
14
|
+
constructor(private readonly recipeDependency: RecipeDependency,
|
|
15
|
+
private readonly installDir: string) {
|
|
10
16
|
}
|
|
11
17
|
|
|
12
18
|
static handle(connection: rpc.MessageConnection): void {
|
|
13
19
|
connection.onRequest(new rpc.RequestType<InstallRecipes, InstallRecipesResponse, Error>("InstallRecipes"), async (request) => {
|
|
20
|
+
const installDir = request.installDir;
|
|
21
|
+
|
|
14
22
|
try {
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
installer.on('close', (exitCode: number) => {
|
|
26
|
-
if (exitCode === 0) {
|
|
27
|
-
resolve();
|
|
28
|
-
} else {
|
|
29
|
-
reject(new Error(`npm install exited with code ${exitCode}`));
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
});
|
|
23
|
+
const allRecipes = RecipeRegistry.all;
|
|
24
|
+
const beforeInstall = allRecipes.size;
|
|
25
|
+
|
|
26
|
+
if (typeof request.recipeDependency === "object") {
|
|
27
|
+
if (!fs.existsSync(installDir)) {
|
|
28
|
+
fs.mkdirSync(installDir, {recursive: true});
|
|
29
|
+
fs.writeFileSync(path.join(installDir, "package.json"),
|
|
30
|
+
`{"name": "please-work"}`)
|
|
31
|
+
}
|
|
32
|
+
const pkg = request.recipeDependency.packageName;
|
|
33
33
|
|
|
34
|
-
|
|
34
|
+
await new Promise<void>((resolve, reject) => {
|
|
35
|
+
const installer = spawn("npm", ["install", pkg], {
|
|
36
|
+
cwd: installDir
|
|
37
|
+
});
|
|
38
|
+
installer.stdout.on("data", (data: any) => {
|
|
39
|
+
// TODO write this to rpc log instead
|
|
40
|
+
console.log(data.toString());
|
|
41
|
+
});
|
|
42
|
+
installer.stderr.on("data", (data: any) => {
|
|
43
|
+
// TODO write this to rpc log instead
|
|
44
|
+
console.log(data.toString());
|
|
45
|
+
});
|
|
46
|
+
installer.on("error", reject);
|
|
47
|
+
installer.on("close", (exitCode: number) => {
|
|
48
|
+
if (exitCode === 0) {
|
|
49
|
+
resolve();
|
|
50
|
+
} else {
|
|
51
|
+
reject(new Error(`npm install exited with code ${exitCode}`));
|
|
52
|
+
}
|
|
53
|
+
});
|
|
54
|
+
});
|
|
35
55
|
|
|
36
|
-
|
|
56
|
+
const resolvedPath = require.resolve(path.join(installDir, "node_modules", pkg));
|
|
57
|
+
const recipeExports = require(resolvedPath);
|
|
58
|
+
console.log("Loaded module exports: " + recipeExports)
|
|
59
|
+
} else {
|
|
60
|
+
require(request.recipeDependency);
|
|
61
|
+
}
|
|
37
62
|
|
|
38
|
-
return {recipesInstalled:
|
|
63
|
+
return {recipesInstalled: allRecipes.size - beforeInstall};
|
|
39
64
|
} catch (error: any) {
|
|
40
|
-
|
|
65
|
+
console.log(error.stack);
|
|
66
|
+
throw new Error(`Failed to install or require module ${request.recipeDependency}: ${error?.message}`);
|
|
41
67
|
}
|
|
42
68
|
});
|
|
43
69
|
}
|
package/src/rpc/rewrite-rpc.ts
CHANGED
|
@@ -32,6 +32,7 @@ import {RpcObjectData, RpcObjectState, RpcReceiveQueue} from "./queue";
|
|
|
32
32
|
import {RpcCodecs} from "./codec";
|
|
33
33
|
import {RpcRecipe} from "./recipe";
|
|
34
34
|
import {ExecutionContext} from "../execution";
|
|
35
|
+
import {InstallRecipes, InstallRecipesResponse, RecipeDependency} from "./request/install-recipes";
|
|
35
36
|
|
|
36
37
|
export class RewriteRpc {
|
|
37
38
|
private readonly snowflake = SnowflakeId();
|
|
@@ -60,6 +61,7 @@ export class RewriteRpc {
|
|
|
60
61
|
GetRecipes.handle(this.connection);
|
|
61
62
|
PrepareRecipe.handle(this.connection, preparedRecipes);
|
|
62
63
|
Print.handle(this.connection, getObject, getCursor);
|
|
64
|
+
InstallRecipes.handle(this.connection);
|
|
63
65
|
|
|
64
66
|
this.connection.listen();
|
|
65
67
|
}
|
|
@@ -160,6 +162,13 @@ export class RewriteRpc {
|
|
|
160
162
|
return generated;
|
|
161
163
|
}
|
|
162
164
|
|
|
165
|
+
installRecipes(recipeModule: RecipeDependency, installDir?: string): Promise<InstallRecipesResponse> {
|
|
166
|
+
return this.connection.sendRequest(
|
|
167
|
+
new rpc.RequestType<InstallRecipes, InstallRecipesResponse, Error>("InstallRecipes"),
|
|
168
|
+
new InstallRecipes(recipeModule, installDir || process.cwd())
|
|
169
|
+
);
|
|
170
|
+
}
|
|
171
|
+
|
|
163
172
|
private localObject<P>(obj: P): string {
|
|
164
173
|
let id = this.localObjectIds.get(obj);
|
|
165
174
|
if (!id) {
|