pynect 0.2.9 → 0.2.10
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/README.md +29 -34
- package/SECURITY.md +6 -6
- package/dist/cli/codegen.js +3 -3
- package/dist/cli/codegen.js.map +1 -1
- package/dist/cli/sync.d.ts.map +1 -1
- package/dist/cli/sync.js +38 -19
- package/dist/cli/sync.js.map +1 -1
- package/dist/config/project.d.ts +4 -54
- package/dist/config/project.d.ts.map +1 -1
- package/dist/config/project.js +56 -123
- package/dist/config/project.js.map +1 -1
- package/dist/core/isolated-worker.js +4 -4
- package/dist/core/isolated-worker.js.map +1 -1
- package/dist/core/py-proxy.d.ts +2 -1
- package/dist/core/py-proxy.d.ts.map +1 -1
- package/dist/core/py-proxy.js +24 -9
- package/dist/core/py-proxy.js.map +1 -1
- package/dist/core/py-runtime.d.ts +1 -9
- package/dist/core/py-runtime.d.ts.map +1 -1
- package/dist/core/py-runtime.js +34 -128
- package/dist/core/py-runtime.js.map +1 -1
- package/dist/core/pynect-callback.d.ts +5 -14
- package/dist/core/pynect-callback.d.ts.map +1 -1
- package/dist/core/pynect-callback.js +33 -80
- package/dist/core/pynect-callback.js.map +1 -1
- package/dist/env/project-environment.d.ts +9 -30
- package/dist/env/project-environment.d.ts.map +1 -1
- package/dist/env/project-environment.js +32 -217
- package/dist/env/project-environment.js.map +1 -1
- package/dist/env/python.d.ts +16 -0
- package/dist/env/python.d.ts.map +1 -0
- package/dist/env/python.js +9 -0
- package/dist/env/python.js.map +1 -0
- package/dist/index.d.ts +8 -29
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -39
- package/dist/index.js.map +1 -1
- package/dist/types/config.d.ts +8 -85
- package/dist/types/config.d.ts.map +1 -1
- package/dist/types/config.js +11 -15
- package/dist/types/config.js.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/package.json +3 -4
- package/prebuilds/darwin-arm64/pynect-prebuild.json +1 -1
- package/prebuilds/darwin-arm64/pynect_addon.node +0 -0
- package/prebuilds/darwin-x64/pynect-prebuild.json +1 -1
- package/prebuilds/darwin-x64/pynect_addon.node +0 -0
- package/prebuilds/linux-arm64/pynect-prebuild.json +1 -1
- package/prebuilds/linux-x64/pynect-prebuild.json +1 -1
- package/prebuilds/win32-arm64/pynect-prebuild.json +1 -1
- package/prebuilds/win32-arm64/pynect_addon.node +0 -0
- package/prebuilds/win32-x64/pynect-prebuild.json +1 -1
- package/prebuilds/win32-x64/pynect_addon.node +0 -0
- package/python/pynect_runtime.py +1 -1
- package/scripts/build-native.js +4 -3
- package/scripts/postinstall.js +2 -2
- package/scripts/python.js +33 -0
- package/scripts/smoke-python-boundary.js +38 -57
- package/dist/env/executables.d.ts +0 -3
- package/dist/env/executables.d.ts.map +0 -1
- package/dist/env/executables.js +0 -14
- package/dist/env/executables.js.map +0 -1
- package/dist/env/package-installer.d.ts +0 -232
- package/dist/env/package-installer.d.ts.map +0 -1
- package/dist/env/package-installer.js +0 -615
- package/dist/env/package-installer.js.map +0 -1
- package/dist/env/pyfig-adapter.d.ts +0 -38
- package/dist/env/pyfig-adapter.d.ts.map +0 -1
- package/dist/env/pyfig-adapter.js +0 -10
- package/dist/env/pyfig-adapter.js.map +0 -1
- package/dist/env/python-detector.d.ts +0 -48
- package/dist/env/python-detector.d.ts.map +0 -1
- package/dist/env/python-detector.js +0 -182
- package/dist/env/python-detector.js.map +0 -1
- package/dist/env/python-provisioner.d.ts +0 -16
- package/dist/env/python-provisioner.d.ts.map +0 -1
- package/dist/env/python-provisioner.js +0 -42
- package/dist/env/python-provisioner.js.map +0 -1
- package/dist/env/venv-manager.d.ts +0 -56
- package/dist/env/venv-manager.d.ts.map +0 -1
- package/dist/env/venv-manager.js +0 -160
- package/dist/env/venv-manager.js.map +0 -1
- package/scripts/pyfig.js +0 -142
- package/scripts/python-provisioner.js +0 -23
package/dist/config/project.js
CHANGED
|
@@ -11,7 +11,6 @@ exports.resolveInstalledPackageDirectory = resolveInstalledPackageDirectory;
|
|
|
11
11
|
exports.parseBoolean = parseBoolean;
|
|
12
12
|
const fs_1 = __importDefault(require("fs"));
|
|
13
13
|
const path_1 = __importDefault(require("path"));
|
|
14
|
-
const crypto_1 = require("crypto");
|
|
15
14
|
const pyfig_1 = require("pyfig");
|
|
16
15
|
exports.CURRENT_PYNECT_SCHEMA_VERSION = 1;
|
|
17
16
|
exports.PYNECT_REQUIRES_PYTHON = '>=3.10.0 <4.0.0';
|
|
@@ -19,12 +18,10 @@ const DEFAULTS = {
|
|
|
19
18
|
python: '',
|
|
20
19
|
requiresPython: exports.PYNECT_REQUIRES_PYTHON,
|
|
21
20
|
managedPython: pyfig_1.DEFAULT_MANAGED_PYTHON,
|
|
22
|
-
|
|
21
|
+
requiresUv: pyfig_1.DEFAULT_REQUIRES_UV,
|
|
23
22
|
installPython: true,
|
|
24
23
|
installUv: true,
|
|
25
24
|
createVirtualEnvironment: true,
|
|
26
|
-
autoSync: 'never',
|
|
27
|
-
lockfile: 'pynect.lock',
|
|
28
25
|
};
|
|
29
26
|
/**
|
|
30
27
|
* Resolve one project policy for the runtime and CLI.
|
|
@@ -35,24 +32,26 @@ function resolveProjectConfig(overrides = {}) {
|
|
|
35
32
|
const rootHint = overrides.projectRoot ?? env['PYNECT_PROJECT_ROOT'] ?? env['INIT_CWD'];
|
|
36
33
|
const projectRoot = path_1.default.resolve(rootHint || (0, pyfig_1.resolveProjectRoot)(process.cwd()));
|
|
37
34
|
const packageManifest = readRootPynectManifest(projectRoot);
|
|
38
|
-
const apiManifest = validatePackageManifest(
|
|
35
|
+
const apiManifest = validatePackageManifest({
|
|
36
|
+
schemaVersion: overrides.schemaVersion,
|
|
37
|
+
project: overrides.project,
|
|
38
|
+
tool: overrides.tool,
|
|
39
|
+
}, 'Pynect API config');
|
|
39
40
|
const manifest = mergeCanonicalManifests(packageManifest, apiManifest);
|
|
40
41
|
const project = manifest.project;
|
|
41
42
|
const apiProject = apiManifest.project;
|
|
42
43
|
const apiTool = apiManifest.tool.pynect;
|
|
43
44
|
const packageTool = packageManifest.tool.pynect;
|
|
44
|
-
const python = first(
|
|
45
|
-
const requiresPython = first(
|
|
46
|
-
const configuredManagedPython = first(
|
|
45
|
+
const python = first(apiTool.python, env['PYNECT_PYTHON'], packageTool.python, DEFAULTS.python);
|
|
46
|
+
const requiresPython = first(apiProject['requires-python'], env['PYNECT_REQUIRES_PYTHON'], packageManifest.project['requires-python'], DEFAULTS.requiresPython);
|
|
47
|
+
const configuredManagedPython = first(apiTool.managedPython, env['PYNECT_MANAGED_PYTHON'], packageTool.managedPython);
|
|
47
48
|
const managedPython = configuredManagedPython ?? DEFAULTS.managedPython;
|
|
48
|
-
const
|
|
49
|
-
const
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const
|
|
53
|
-
const
|
|
54
|
-
const createVirtualEnvironment = resolveBoolean(first(overrides.createVirtualEnvironment, apiTool.createVirtualEnvironment), env['PYNECT_CREATE_VIRTUAL_ENVIRONMENT'], packageTool.createVirtualEnvironment, DEFAULTS.createVirtualEnvironment, 'PYNECT_CREATE_VIRTUAL_ENVIRONMENT');
|
|
55
|
-
const callbackMaxDepth = first(overrides.callbacks?.maxDepth, apiTool.callbacks?.maxDepth, parseOptionalPositiveInteger(env['PYNECT_CALLBACK_MAX_DEPTH'], 'PYNECT_CALLBACK_MAX_DEPTH'), packageTool.callbacks?.maxDepth);
|
|
49
|
+
const requiresUv = first(apiTool.requiresUv, env['PYNECT_REQUIRES_UV'], packageTool.requiresUv, DEFAULTS.requiresUv);
|
|
50
|
+
const requirements = first(apiTool.requirements, packageTool.requirements, []).map(requirement => path_1.default.resolve(projectRoot, requirement));
|
|
51
|
+
const installPython = resolveBoolean(apiTool.installPython, env['PYNECT_INSTALL_PYTHON'], packageTool.installPython, DEFAULTS.installPython, 'PYNECT_INSTALL_PYTHON');
|
|
52
|
+
const installUv = resolveBoolean(apiTool.installUv, env['PYNECT_INSTALL_UV'], packageTool.installUv, DEFAULTS.installUv, 'PYNECT_INSTALL_UV');
|
|
53
|
+
const createVirtualEnvironment = resolveBoolean(apiTool.createVirtualEnvironment, env['PYNECT_CREATE_VIRTUAL_ENVIRONMENT'], packageTool.createVirtualEnvironment, DEFAULTS.createVirtualEnvironment, 'PYNECT_CREATE_VIRTUAL_ENVIRONMENT');
|
|
54
|
+
const callbackMaxDepth = first(apiTool.callbacks?.maxDepth, parseOptionalPositiveInteger(env['PYNECT_CALLBACK_MAX_DEPTH'], 'PYNECT_CALLBACK_MAX_DEPTH'), packageTool.callbacks?.maxDepth);
|
|
56
55
|
const resolvedManifest = {
|
|
57
56
|
schemaVersion: exports.CURRENT_PYNECT_SCHEMA_VERSION,
|
|
58
57
|
project: {
|
|
@@ -62,21 +61,15 @@ function resolveProjectConfig(overrides = {}) {
|
|
|
62
61
|
dependencies: project.dependencies ?? [],
|
|
63
62
|
},
|
|
64
63
|
tool: {
|
|
65
|
-
uv: {
|
|
66
|
-
package: false,
|
|
67
|
-
'override-dependencies': manifest.tool.uv['override-dependencies'] ?? [],
|
|
68
|
-
},
|
|
69
64
|
pynect: {
|
|
70
65
|
modules: manifest.tool.pynect.modules ?? {},
|
|
66
|
+
requirements: manifest.tool.pynect.requirements ?? [],
|
|
71
67
|
python,
|
|
72
68
|
managedPython,
|
|
73
|
-
|
|
69
|
+
requiresUv,
|
|
74
70
|
installPython,
|
|
75
71
|
installUv,
|
|
76
72
|
createVirtualEnvironment,
|
|
77
|
-
autoSync,
|
|
78
|
-
lockfile,
|
|
79
|
-
generatedDirectory,
|
|
80
73
|
callbacks: callbackMaxDepth === undefined ? undefined : { maxDepth: callbackMaxDepth },
|
|
81
74
|
},
|
|
82
75
|
},
|
|
@@ -85,15 +78,13 @@ function resolveProjectConfig(overrides = {}) {
|
|
|
85
78
|
projectRoot,
|
|
86
79
|
python,
|
|
87
80
|
requiresPython,
|
|
81
|
+
requirements,
|
|
88
82
|
managedPython,
|
|
89
83
|
managedPythonExplicit: configuredManagedPython !== undefined,
|
|
90
|
-
|
|
84
|
+
requiresUv,
|
|
91
85
|
installPython,
|
|
92
86
|
installUv,
|
|
93
87
|
createVirtualEnvironment,
|
|
94
|
-
autoSync,
|
|
95
|
-
lockfile: resolveInsideProject(projectRoot, lockfile, 'pynect.lock'),
|
|
96
|
-
generatedDirectory,
|
|
97
88
|
callbackMaxDepth,
|
|
98
89
|
packageManifest: resolvedManifest,
|
|
99
90
|
env,
|
|
@@ -122,7 +113,9 @@ function validatePackageManifest(value, source) {
|
|
|
122
113
|
value['schemaVersion'] !== exports.CURRENT_PYNECT_SCHEMA_VERSION) {
|
|
123
114
|
throw new TypeError(`${source}: pynect.schemaVersion must be ${exports.CURRENT_PYNECT_SCHEMA_VERSION} when specified.`);
|
|
124
115
|
}
|
|
116
|
+
assertKnownKeys(value, ['schemaVersion', 'project', 'tool'], `${source}: pynect`);
|
|
125
117
|
const project = optionalRecord(value, 'project', source);
|
|
118
|
+
assertKnownKeys(project, ['name', 'version', 'requires-python', 'dependencies'], `${source}: pynect.project`);
|
|
126
119
|
optionalString(project, 'name', `${source}: pynect.project`);
|
|
127
120
|
optionalString(project, 'version', `${source}: pynect.project`);
|
|
128
121
|
optionalString(project, 'requires-python', `${source}: pynect.project`);
|
|
@@ -130,93 +123,58 @@ function validatePackageManifest(value, source) {
|
|
|
130
123
|
validateRequirements(project['dependencies'], `${source}: pynect.project.dependencies`);
|
|
131
124
|
}
|
|
132
125
|
const toolTables = optionalRecord(value, 'tool', source);
|
|
133
|
-
|
|
134
|
-
if (uv['package'] !== undefined && uv['package'] !== false) {
|
|
135
|
-
throw new TypeError(`${source}: pynect.tool.uv.package must be false.`);
|
|
136
|
-
}
|
|
137
|
-
if (uv['override-dependencies'] !== undefined) {
|
|
138
|
-
validateRequirements(uv['override-dependencies'], `${source}: pynect.tool.uv["override-dependencies"]`);
|
|
139
|
-
}
|
|
126
|
+
assertKnownKeys(toolTables, ['pynect'], `${source}: pynect.tool`);
|
|
140
127
|
const pynectTool = optionalRecord(toolTables, 'pynect', `${source}: pynect.tool`);
|
|
141
128
|
validatePynectTool(pynectTool, source);
|
|
142
|
-
// Flat keys remain accepted so existing packages can migrate without a flag day.
|
|
143
|
-
optionalString(value, 'requiresPython', source);
|
|
144
|
-
optionalString(value, 'python', source);
|
|
145
|
-
optionalString(value, 'managedPython', source);
|
|
146
|
-
optionalString(value, 'uvVersion', source);
|
|
147
|
-
optionalString(value, 'lockfile', source);
|
|
148
|
-
optionalString(value, 'generatedDirectory', source);
|
|
149
|
-
optionalBoolean(value, 'installPython', source);
|
|
150
|
-
optionalBoolean(value, 'installUv', source);
|
|
151
|
-
optionalBoolean(value, 'createVirtualEnvironment', source);
|
|
152
|
-
if (value['autoSync'] !== undefined)
|
|
153
|
-
parseAutoSync(value['autoSync']);
|
|
154
|
-
if (value['requirements'] !== undefined) {
|
|
155
|
-
validateRequirements(value['requirements'], `${source}: pynect.requirements`);
|
|
156
|
-
}
|
|
157
|
-
if (value['modules'] !== undefined)
|
|
158
|
-
validateModules(value['modules'], source);
|
|
159
|
-
if (value['overrides'] !== undefined)
|
|
160
|
-
validateOverrides(value['overrides'], source);
|
|
161
|
-
const legacyOverrides = value['overrides'] === undefined
|
|
162
|
-
? undefined
|
|
163
|
-
: Object.entries(value['overrides'])
|
|
164
|
-
.map(([distribution, constraint]) => `${distribution}${constraint}`)
|
|
165
|
-
.sort();
|
|
166
129
|
return {
|
|
167
130
|
schemaVersion: exports.CURRENT_PYNECT_SCHEMA_VERSION,
|
|
168
131
|
project: {
|
|
169
132
|
name: project['name'],
|
|
170
133
|
version: project['version'],
|
|
171
|
-
'requires-python':
|
|
172
|
-
dependencies:
|
|
134
|
+
'requires-python': project['requires-python'],
|
|
135
|
+
dependencies: project['dependencies'],
|
|
173
136
|
},
|
|
174
137
|
tool: {
|
|
175
|
-
uv: {
|
|
176
|
-
package: false,
|
|
177
|
-
'override-dependencies': first(uv['override-dependencies'], legacyOverrides),
|
|
178
|
-
},
|
|
179
138
|
pynect: {
|
|
180
|
-
modules:
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
lockfile: first(pynectTool['lockfile'], value['lockfile']),
|
|
189
|
-
generatedDirectory: first(pynectTool['generatedDirectory'], value['generatedDirectory']),
|
|
139
|
+
modules: pynectTool['modules'],
|
|
140
|
+
requirements: pynectTool['requirements'],
|
|
141
|
+
python: pynectTool['python'],
|
|
142
|
+
managedPython: pynectTool['managedPython'],
|
|
143
|
+
requiresUv: pynectTool['requiresUv'],
|
|
144
|
+
installPython: pynectTool['installPython'],
|
|
145
|
+
installUv: pynectTool['installUv'],
|
|
146
|
+
createVirtualEnvironment: pynectTool['createVirtualEnvironment'],
|
|
190
147
|
callbacks: pynectTool['callbacks'],
|
|
191
148
|
},
|
|
192
149
|
},
|
|
193
150
|
};
|
|
194
151
|
}
|
|
195
|
-
function validateOverrides(value, source) {
|
|
196
|
-
if (!isRecord(value))
|
|
197
|
-
throw new TypeError(`${source}: pynect.overrides must be an object.`);
|
|
198
|
-
for (const [distribution, constraint] of Object.entries(value)) {
|
|
199
|
-
if (!/^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(distribution) ||
|
|
200
|
-
typeof constraint !== 'string' || !constraint.trim() || /[\0\r\n]/u.test(constraint)) {
|
|
201
|
-
throw new TypeError(`${source}: invalid Pynect override for ${JSON.stringify(distribution)}.`);
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
152
|
function validatePynectTool(value, source) {
|
|
153
|
+
assertKnownKeys(value, [
|
|
154
|
+
'modules',
|
|
155
|
+
'requirements',
|
|
156
|
+
'python',
|
|
157
|
+
'managedPython',
|
|
158
|
+
'requiresUv',
|
|
159
|
+
'installPython',
|
|
160
|
+
'installUv',
|
|
161
|
+
'createVirtualEnvironment',
|
|
162
|
+
'callbacks',
|
|
163
|
+
], `${source}: pynect.tool.pynect`);
|
|
206
164
|
optionalString(value, 'python', `${source}: pynect.tool.pynect`);
|
|
207
165
|
optionalString(value, 'managedPython', `${source}: pynect.tool.pynect`);
|
|
208
|
-
optionalString(value, '
|
|
209
|
-
optionalString(value, 'lockfile', `${source}: pynect.tool.pynect`);
|
|
210
|
-
optionalString(value, 'generatedDirectory', `${source}: pynect.tool.pynect`);
|
|
166
|
+
optionalString(value, 'requiresUv', `${source}: pynect.tool.pynect`);
|
|
211
167
|
optionalBoolean(value, 'installPython', `${source}: pynect.tool.pynect`);
|
|
212
168
|
optionalBoolean(value, 'installUv', `${source}: pynect.tool.pynect`);
|
|
213
169
|
optionalBoolean(value, 'createVirtualEnvironment', `${source}: pynect.tool.pynect`);
|
|
214
|
-
if (value['
|
|
215
|
-
|
|
170
|
+
if (value['requirements'] !== undefined) {
|
|
171
|
+
validateRequirements(value['requirements'], `${source}: pynect.tool.pynect.requirements`);
|
|
172
|
+
}
|
|
216
173
|
if (value['modules'] !== undefined)
|
|
217
174
|
validateModules(value['modules'], source);
|
|
218
175
|
if (value['callbacks'] !== undefined) {
|
|
219
176
|
const callbacks = optionalRecord(value, 'callbacks', `${source}: pynect.tool.pynect`);
|
|
177
|
+
assertKnownKeys(callbacks, ['maxDepth'], `${source}: pynect.tool.pynect.callbacks`);
|
|
220
178
|
if (callbacks['maxDepth'] !== undefined &&
|
|
221
179
|
(!Number.isSafeInteger(callbacks['maxDepth']) || callbacks['maxDepth'] <= 0)) {
|
|
222
180
|
throw new TypeError(`${source}: pynect.tool.pynect.callbacks.maxDepth must be a positive integer.`);
|
|
@@ -242,6 +200,7 @@ function validateModules(value, source) {
|
|
|
242
200
|
!/^[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)*$/.test(module['import'])) {
|
|
243
201
|
throw new TypeError(`${source}: pynect.modules.${name}.import must be a Python module name.`);
|
|
244
202
|
}
|
|
203
|
+
assertKnownKeys(module, ['import', 'include'], `${source}: pynect.modules.${name}`);
|
|
245
204
|
if (module['include'] !== undefined) {
|
|
246
205
|
stringArray(module['include'], `${source}: pynect.modules.${name}.include`);
|
|
247
206
|
}
|
|
@@ -251,7 +210,7 @@ function emptyCanonicalManifest() {
|
|
|
251
210
|
return {
|
|
252
211
|
schemaVersion: exports.CURRENT_PYNECT_SCHEMA_VERSION,
|
|
253
212
|
project: {},
|
|
254
|
-
tool: {
|
|
213
|
+
tool: { pynect: {} },
|
|
255
214
|
};
|
|
256
215
|
}
|
|
257
216
|
function mergeCanonicalManifests(base, override) {
|
|
@@ -259,7 +218,6 @@ function mergeCanonicalManifests(base, override) {
|
|
|
259
218
|
schemaVersion: exports.CURRENT_PYNECT_SCHEMA_VERSION,
|
|
260
219
|
project: { ...base.project, ...withoutUndefined(override.project) },
|
|
261
220
|
tool: {
|
|
262
|
-
uv: { ...base.tool.uv, ...withoutUndefined(override.tool.uv) },
|
|
263
221
|
pynect: { ...base.tool.pynect, ...withoutUndefined(override.tool.pynect) },
|
|
264
222
|
},
|
|
265
223
|
};
|
|
@@ -267,24 +225,6 @@ function mergeCanonicalManifests(base, override) {
|
|
|
267
225
|
function withoutUndefined(value) {
|
|
268
226
|
return Object.fromEntries(Object.entries(value).filter(([, item]) => item !== undefined));
|
|
269
227
|
}
|
|
270
|
-
function defaultGeneratedDirectory(projectRoot) {
|
|
271
|
-
const installedPackage = resolveInstalledPackageDirectory(projectRoot, 'pynect');
|
|
272
|
-
const installParent = installedPackage
|
|
273
|
-
? path_1.default.dirname(installedPackage)
|
|
274
|
-
: path_1.default.join(projectRoot, 'node_modules');
|
|
275
|
-
const localInstallParent = path_1.default.join(projectRoot, 'node_modules');
|
|
276
|
-
if (pathsEqual(installParent, localInstallParent))
|
|
277
|
-
return path_1.default.join(installParent, '.pynect');
|
|
278
|
-
const projectKey = (0, crypto_1.createHash)('sha256').update(path_1.default.resolve(projectRoot)).digest('hex').slice(0, 12);
|
|
279
|
-
return path_1.default.join(installParent, '.pynect', projectKey);
|
|
280
|
-
}
|
|
281
|
-
function pathsEqual(left, right) {
|
|
282
|
-
const resolvedLeft = path_1.default.resolve(left);
|
|
283
|
-
const resolvedRight = path_1.default.resolve(right);
|
|
284
|
-
return process.platform === 'win32'
|
|
285
|
-
? resolvedLeft.toLowerCase() === resolvedRight.toLowerCase()
|
|
286
|
-
: resolvedLeft === resolvedRight;
|
|
287
|
-
}
|
|
288
228
|
function resolveInstalledPackageDirectory(fromDirectory, packageName) {
|
|
289
229
|
let current = path_1.default.resolve(fromDirectory);
|
|
290
230
|
while (true) {
|
|
@@ -297,14 +237,6 @@ function resolveInstalledPackageDirectory(fromDirectory, packageName) {
|
|
|
297
237
|
current = parent;
|
|
298
238
|
}
|
|
299
239
|
}
|
|
300
|
-
function resolveInsideProject(projectRoot, value, fallback) {
|
|
301
|
-
const resolved = path_1.default.resolve(projectRoot, value || fallback);
|
|
302
|
-
const relative = path_1.default.relative(projectRoot, resolved);
|
|
303
|
-
if (relative.startsWith('..') || path_1.default.isAbsolute(relative)) {
|
|
304
|
-
throw new TypeError(`Pynect lockfile must be inside the project root: ${resolved}`);
|
|
305
|
-
}
|
|
306
|
-
return resolved;
|
|
307
|
-
}
|
|
308
240
|
function resolveBoolean(override, environment, manifest, fallback, name) {
|
|
309
241
|
if (override !== undefined)
|
|
310
242
|
return override;
|
|
@@ -319,11 +251,6 @@ function parseBoolean(value, name) {
|
|
|
319
251
|
return false;
|
|
320
252
|
throw new TypeError(`${name} must be true or false; received ${value}.`);
|
|
321
253
|
}
|
|
322
|
-
function parseAutoSync(value) {
|
|
323
|
-
if (value === 'never' || value === 'if-missing')
|
|
324
|
-
return value;
|
|
325
|
-
throw new TypeError(`autoSync must be "never" or "if-missing"; received ${String(value)}.`);
|
|
326
|
-
}
|
|
327
254
|
function parseOptionalPositiveInteger(value, name) {
|
|
328
255
|
if (value === undefined)
|
|
329
256
|
return undefined;
|
|
@@ -338,6 +265,12 @@ function optionalString(value, key, source) {
|
|
|
338
265
|
throw new TypeError(`${source}: pynect.${key} must be a string.`);
|
|
339
266
|
}
|
|
340
267
|
}
|
|
268
|
+
function assertKnownKeys(value, known, source) {
|
|
269
|
+
const unknown = Object.keys(value).filter(key => !known.includes(key));
|
|
270
|
+
if (unknown.length > 0) {
|
|
271
|
+
throw new TypeError(`${source} contains unknown field(s): ${unknown.join(', ')}.`);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
341
274
|
function optionalBoolean(value, key, source) {
|
|
342
275
|
if (value[key] !== undefined && typeof value[key] !== 'boolean') {
|
|
343
276
|
throw new TypeError(`${source}: pynect.${key} must be a boolean.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/config/project.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/config/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.IsolatedWorker = void 0;
|
|
4
4
|
const readline_1 = require("readline");
|
|
5
|
-
const
|
|
5
|
+
const python_1 = require("../env/python");
|
|
6
6
|
/** Persistent JSON-only child process used when hard termination is required. */
|
|
7
7
|
class IsolatedWorker {
|
|
8
8
|
options;
|
|
@@ -69,12 +69,12 @@ class IsolatedWorker {
|
|
|
69
69
|
...this.options.pythonPath,
|
|
70
70
|
process.env['PYTHONPATH'],
|
|
71
71
|
].filter(Boolean).join(process.platform === 'win32' ? ';' : ':');
|
|
72
|
-
const
|
|
72
|
+
const runtime = (0, python_1.createPython)({
|
|
73
73
|
projectRoot: this.options.projectRoot,
|
|
74
|
-
|
|
74
|
+
python: this.options.pythonExecutable,
|
|
75
75
|
env: this.options.env,
|
|
76
76
|
});
|
|
77
|
-
const child = await
|
|
77
|
+
const child = await runtime.uv(['run', '--', 'python', this.options.scriptPath], {
|
|
78
78
|
cwd: this.options.cwd,
|
|
79
79
|
env: {
|
|
80
80
|
...process.env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolated-worker.js","sourceRoot":"","sources":["../../src/core/isolated-worker.ts"],"names":[],"mappings":";;;AACA,uCAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"isolated-worker.js","sourceRoot":"","sources":["../../src/core/isolated-worker.ts"],"names":[],"mappings":"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"}
|
package/dist/core/py-proxy.d.ts
CHANGED
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
*/
|
|
19
19
|
import type { NativeAddon, PyCallOptions } from '../types/addon';
|
|
20
20
|
import type { PyObjectId, AttributePath, SerializedValue } from '../types/python';
|
|
21
|
+
import { type PynectCallbackScope } from './pynect-callback';
|
|
21
22
|
export declare const PYPROXY_INTERNAL: unique symbol;
|
|
22
23
|
export declare const PYPROXY_OBJECTID: unique symbol;
|
|
23
24
|
export declare const PYPROXY_PATH: unique symbol;
|
|
@@ -64,7 +65,7 @@ export declare class PyProxy {
|
|
|
64
65
|
static _deserializeAddonResult(result: unknown, internal: PyProxyInternal): unknown;
|
|
65
66
|
private static _abortError;
|
|
66
67
|
private static _withAbort;
|
|
67
|
-
static _serializeArg(value: unknown, addon?: NativeAddon): Promise<SerializedValue>;
|
|
68
|
+
static _serializeArg(value: unknown, addon?: NativeAddon, callbackScope?: PynectCallbackScope): Promise<SerializedValue>;
|
|
68
69
|
static _getTypedArrayDtype(arr: ArrayBufferView): string;
|
|
69
70
|
static _isPlainObject(obj: unknown): boolean;
|
|
70
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"py-proxy.d.ts","sourceRoot":"","sources":["../../src/core/py-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAoB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,EACV,UAAU,EACV,aAAa,EACb,eAAe,EAChB,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"py-proxy.d.ts","sourceRoot":"","sources":["../../src/core/py-proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/core/py-proxy.js
CHANGED
|
@@ -239,13 +239,24 @@ class PyProxy {
|
|
|
239
239
|
return this._call(this[exports.PYPROXY_INTERNAL], args, options);
|
|
240
240
|
}
|
|
241
241
|
async _call(internal, args, controls = {}) {
|
|
242
|
+
let callbackScope;
|
|
242
243
|
try {
|
|
243
244
|
const addon = internal.addon;
|
|
244
245
|
if (controls.signal?.aborted) {
|
|
245
246
|
throw PyProxy._abortError();
|
|
246
247
|
}
|
|
248
|
+
callbackScope = (0, pynect_callback_1.createPynectCallbackScope)(addon, {
|
|
249
|
+
decode: value => PyProxy._deserializeAddonResult(value, {
|
|
250
|
+
objectId: 0,
|
|
251
|
+
path: [],
|
|
252
|
+
addon,
|
|
253
|
+
callTimeout: internal.callTimeout,
|
|
254
|
+
executionTimeout: internal.executionTimeout,
|
|
255
|
+
}),
|
|
256
|
+
encode: value => PyProxy._serializeArg(value, addon, callbackScope),
|
|
257
|
+
});
|
|
247
258
|
// Serialize arguments
|
|
248
|
-
const serializedArgs = await Promise.all(args.map(arg => PyProxy._serializeArg(arg, addon)));
|
|
259
|
+
const serializedArgs = await Promise.all(args.map(arg => PyProxy._serializeArg(arg, addon, callbackScope)));
|
|
249
260
|
const callOptions = {
|
|
250
261
|
args: serializedArgs,
|
|
251
262
|
kwargs: {},
|
|
@@ -267,7 +278,10 @@ class PyProxy {
|
|
|
267
278
|
PyProxy._isPlainObject(lastArg)) {
|
|
268
279
|
// Treat as kwargs
|
|
269
280
|
callOptions.args = serializedArgs.slice(0, -1);
|
|
270
|
-
const kwargsEntries = await Promise.all(Object.entries(lastArg).map(async ([k, v]) => [
|
|
281
|
+
const kwargsEntries = await Promise.all(Object.entries(lastArg).map(async ([k, v]) => [
|
|
282
|
+
k,
|
|
283
|
+
await PyProxy._serializeArg(v, addon, callbackScope),
|
|
284
|
+
]));
|
|
271
285
|
callOptions.kwargs = Object.fromEntries(kwargsEntries);
|
|
272
286
|
}
|
|
273
287
|
}
|
|
@@ -287,6 +301,9 @@ class PyProxy {
|
|
|
287
301
|
}
|
|
288
302
|
throw err;
|
|
289
303
|
}
|
|
304
|
+
finally {
|
|
305
|
+
callbackScope?.[Symbol.dispose]();
|
|
306
|
+
}
|
|
290
307
|
}
|
|
291
308
|
// Async Iterator (for await...of)
|
|
292
309
|
async *_makeAsyncIterator(internal) {
|
|
@@ -433,20 +450,18 @@ class PyProxy {
|
|
|
433
450
|
onAbort();
|
|
434
451
|
});
|
|
435
452
|
}
|
|
436
|
-
static async _serializeArg(value, addon) {
|
|
453
|
+
static async _serializeArg(value, addon, callbackScope) {
|
|
437
454
|
// Already a SerializedValue
|
|
438
455
|
if (value !== null &&
|
|
439
456
|
typeof value === 'object' &&
|
|
440
457
|
'format' in value) {
|
|
441
458
|
return value;
|
|
442
459
|
}
|
|
443
|
-
if (addon) {
|
|
444
|
-
const callback = (0, pynect_callback_1.serializePynectCallback)(value, addon);
|
|
445
|
-
if (callback)
|
|
446
|
-
return callback;
|
|
447
|
-
}
|
|
448
460
|
if (typeof value === 'function') {
|
|
449
|
-
|
|
461
|
+
if (!addon || !callbackScope) {
|
|
462
|
+
throw new TypeError('JavaScript callbacks are only supported as Python call arguments.');
|
|
463
|
+
}
|
|
464
|
+
return callbackScope.register(value);
|
|
450
465
|
}
|
|
451
466
|
// PyProxy -> pass as Python reference
|
|
452
467
|
if (value instanceof PyProxy) {
|