@tsplc/build 0.2.9 → 0.2.11

package/package.json

@@ -15,7 +15,7 @@
     "url": "git+https://github.com/livingforjesus/tsplc.git",
     "directory": "packages/build"
   },
-  "version": "0.2.9",
+  "version": "0.2.11",
   "type": "module",
   "exports": {
     ".": {
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "zod": "4.3.6",
-    "@tsplc/config": "0.2.9",
-    "@tsplc/typegen": "0.2.9"
+    "@tsplc/config": "0.2.11",
+    "@tsplc/typegen": "0.2.11"
   },
   "bin": {
     "tsplc-build": "./dist/cli.js"

package/python/codesys_online.py

@@ -186,16 +186,16 @@ def run_online(engine, request, prepared=None):
             with io.open(progress_path, 'a', encoding='utf-8') as output:
                 output.write(u'{0}Z {1}\n'.format(time.strftime('%Y-%m-%dT%H:%M:%S', time.gmtime()), stage))
     progress('Starting; processor count {0}'.format(Environment.ProcessorCount))
-    # A download starts from the template; online changes reuse the downloaded project, which has its controller and tree.
-    if prepared is not None and (request['operation'] == 'download' or
-                                 os.path.normcase(prepared.path) != os.path.normcase(request['project'])):
+    previous = request.get('baseline')
+    # Operations reuse the downloaded project, which has its controller and tree; a download without one starts from the template.
+    if prepared is not None and os.path.normcase(prepared.path) != os.path.normcase(request['project']):
         prepared.close()
         prepared = None
-    if request['operation'] == 'download':
-        project, pinned, generated = open_template(engine, request, request['project'], request.get('devices'), request['caches'], progress)
-    elif prepared is not None:
+    if prepared is not None:
         progress('Using the project opened ahead')
         project, pinned, generated = prepared, {}, None
+    elif request['operation'] == 'download' and previous is None:
+        project, pinned, generated = open_template(engine, request, request['project'], request.get('devices'), request['caches'], progress)
     else:
         progress('Opening project')
         project = engine.projects.open(request['project'], primary=True)
@@ -214,7 +214,6 @@ def run_online(engine, request, prepared=None):
                 raise RuntimeError('Initial controller user requires an explicit download and credentials')
             online_device.set_credentials_for_initial_user(*credentials)
         progress('Controller connection configured')
-        previous = request.get('baseline')
         if request['operation'] != 'download':
             online_app = engine.online.create_online_application(application)
             core = core_application(online_app)
@@ -238,8 +237,8 @@ def run_online(engine, request, prepared=None):
                             'state': state, 'values': {expression: online_app.read_value(expression) for expression in request.get('read', [])}}
             finally:
                 core.Logout()
-        # A download starts from the template; an online change writes only what changed since the baseline.
-        held = previous['objects'] if request['operation'] == 'online-change' else None
+        # Only what changed since the baseline is written; a template gets every object.
+        held = previous['objects'] if previous is not None else None
         gone = reconcile(application, held, request['objects']) if held is not None else []
         import_objects(engine, application, request, held, progress)
         for obj in gone:

package/python/test_codesys_online.py

@@ -196,12 +196,23 @@ class OnlineLifecycleTests(unittest.TestCase):
         self.engine.projects.open.assert_not_called()
         self.project.close.assert_called_once()
 
-    def test_a_download_or_another_project_closes_the_one_opened_ahead(self):
+    def test_another_project_than_the_one_opened_ahead_closes_it(self):
         stale = SimpleNamespace(path='Other.project', close=Mock())
         codesys_online.run_online(self.engine, self.request, stale)
         stale.close.assert_called_once()
         codesys_online.open_template.assert_called_once()
 
+    def test_download_with_a_baseline_imports_only_changes_into_the_project_opened_ahead_and_rebuilds(self):
+        self.request.update(baseline={
+            'applicationGuid': self.app.guid, 'controllerIds': self.ids, 'objects': [],
+        })
+        self.project.path = 'Application.project'
+        codesys_online.run_online(self.engine, self.request, self.project)
+        codesys_online.open_template.assert_not_called()
+        self.engine.projects.open.assert_not_called()
+        self.assertIs(codesys_online.import_objects.call_args.args[3], self.request['baseline']['objects'])
+        self.assertEqual(self.events, ['import', 'clean', 'compile', 'generate', 'online-wrapper'])
+
     def test_full_download_rejects_library_errors_reported_after_transfer(self):
         def report_library_error(core):
             self.messages.append(SimpleNamespace(text="Could not open library '#VisuShared'."))

package/src/controller-session.ts

@@ -140,24 +140,26 @@ export const runControllerSession = async (
   const resultPath = resolve(root, "result.json");
   await rm(resultPath, { force: true });
   const templateHash = sha256(await readFile(config.template));
-  // A different controller or device tree needs a fresh download from the template.
+  // A different image, template, controller or device tree needs a fresh download from the template.
   const target = controllerTarget(config, config.online);
+  const expected = { imageId: options.imageId, templateHash, target };
+  // A download reuses the baseline when it still fits, and imports only what changed since.
   const previous =
     operation === "download"
-      ? undefined
-      : await readBaseline(root, { imageId: options.imageId, templateHash, target });
+      ? await readBaseline(root, expected).catch(() => undefined)
+      : await readBaseline(root, expected);
   const baseline = previous?.baseline;
   if (options.initializeUser && operation !== "download") {
     throw new Error("Initial user creation requires an explicit download");
   }
   const opened = worker?.prepared;
   const prepared =
-    operation === "online-change" && opened?.baseline === baseline?.generation ? opened : undefined;
+    operation !== "inspect" && opened?.baseline === baseline?.generation ? opened : undefined;
   const generation = prepared?.generation ?? randomUUID();
   const candidate = resolve(root, "generations", generation);
   const project = resolve(candidate, "project", "Application.project");
   await mkdir(resolve(candidate, "project"), { recursive: true });
-  // A download saves the template here, with its controller and device tree.
+  // Opens a copy of the baseline unless the worker opened one ahead; a download without a baseline saves the template here.
   if (previous && !prepared) {
     await cp(previous.project, resolve(candidate, "project"), {
       recursive: true,
@@ -183,17 +185,18 @@ export const runControllerSession = async (
   const sources = operation === "inspect" ? undefined : await loadSources(config);
   const request = {
     libraryReferences: config.libraryReferences,
-    // A download starts from the template; an online change keeps the downloaded project's tree.
-    ...(operation === "download" && {
-      template: await toWindowsPath(config.template, config.codesys.wine),
-      templateHash,
-      // Kept across jobs: generating a device tree takes minutes, and the same inputs make the same one.
-      caches: await toWindowsPath(root, config.codesys.wine),
-      ...(config.deviceTree && {
-        deviceTree: await writeDeviceTree(config.deviceTree, jobDirectory),
-        devices: await toWindowsPath(jobDirectory, config.codesys.wine),
+    // Only a download without a baseline starts from the template; the others keep the downloaded project's tree.
+    ...(operation === "download" &&
+      !previous && {
+        template: await toWindowsPath(config.template, config.codesys.wine),
+        templateHash,
+        // Kept across jobs: generating a device tree takes minutes, and the same inputs make the same one.
+        caches: await toWindowsPath(root, config.codesys.wine),
+        ...(config.deviceTree && {
+          deviceTree: await writeDeviceTree(config.deviceTree, jobDirectory),
+          devices: await toWindowsPath(jobDirectory, config.codesys.wine),
+        }),
       }),
-    }),
     libraries: await Promise.all(
       (config.libraries ?? []).map(async (library) => ({
         ...library,