From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 5G2kC60VsWFrCQAAgWs5BA (envelope-from ) for ; Wed, 08 Dec 2021 21:29:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id sN+lBq0VsWGsdgAA1q6Kng (envelope-from ) for ; Wed, 08 Dec 2021 20:29:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C7C6B261CC for ; Wed, 8 Dec 2021 21:29:32 +0100 (CET) Received: from localhost ([::1]:44474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mv3ZE-0006AB-0R for larch@yhetil.org; Wed, 08 Dec 2021 15:29:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mv3Yl-0005NN-S1 for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mv3Yl-0000BT-K2 for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mv3Yl-0005q2-Fq for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v3 05/43] guix: node-build-system: Refactor patch-dependencies phase. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Dec 2021 20:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163899533622358 (code B ref 51838); Wed, 08 Dec 2021 20:29:03 +0000 Received: (at 51838) by debbugs.gnu.org; 8 Dec 2021 20:28:56 +0000 Received: from localhost ([127.0.0.1]:41545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3Ye-0005oL-BH for submit@debbugs.gnu.org; Wed, 08 Dec 2021 15:28:56 -0500 Received: from mail-ua1-f53.google.com ([209.85.222.53]:44598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3YY-0005mw-LX for 51838@debbugs.gnu.org; Wed, 08 Dec 2021 15:28:51 -0500 Received: by mail-ua1-f53.google.com with SMTP id p2so6850152uad.11 for <51838@debbugs.gnu.org>; Wed, 08 Dec 2021 12:28:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xz8xodiZFPQ+SAaK+8rKtLk3kisnKoUJYuaQkixgSGM=; b=KZdkxNOzfUtK9rwwC+zZBEHaerQHRG3FZv2Wf+yfCPYO7ttecHHq8MAGTAcovqVw8V 0DBvvmLhPZLLQF/UDGGuzqw625oS6PN1LqpxMNSLghHNuHslQfouJU0sqbUL8QX6otUL Iko4uYNM3h0aA5P/LQBxRS2wLPW0mNxQIcJldAbym2sfp+7B17BjUaOWNyWrGOkdSksU Shxp6BT63qbjFZ2Z6tb2uJ6xOMWuAJL2JykSzh9pqW83eG/DI6q5nVNZ5SWAjR5hP+6B cRp+B84auYdgoDJadeGpkmQ3jrFxI847YZHwGqk+FGEWxiFll3wcKF89ZyALlh020ywo zYzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xz8xodiZFPQ+SAaK+8rKtLk3kisnKoUJYuaQkixgSGM=; b=bmUAgWELMPFTOzYjOy019gg9FMRwlyHrTruP1ln/reGS0eomsMaKtXQ7oIs6oCieHl J26zRNCrzREGy7DGrlMNGg8CwDq1BVaRaxHtLKBtji+jcekaQs81ynasokBOwiNFzS/i /9LhXG9tMMAhW+aMTJC5qqD5qa3DW4Xx9iXTc9iqd+w+ZjcAKObQDjJVfm+FQGHQtyn/ ks1qXBQRjyYYlmFR6U9awfsFGe6SD/FjCUWpu4N+D7SNauARRuNEgDgUmn3fufX6MxoA q2h+iO5tJF5WvxXlLbG/xx9mkrwVvdKrRFrBzSvvE6eCx8m7fDV5aTWRJe7MC3N49NHz aGtQ== X-Gm-Message-State: AOAM530+sgV1VVLSrRfHTlJ1SNZMQlKoqM0nIr3e0SntyZ8waimHFWI7 /x6byRbF5RwiOnpLAKq/xkryLC/xjQts7r9tJzo= X-Google-Smtp-Source: ABdhPJzDcJeDCWdc8dW11PYo2e4yILj3GW0An2a7op2aDWTqV1WtqS9FBouuY7lyjpdIv4zpUM43Ow== X-Received: by 2002:a05:6102:c4e:: with SMTP id y14mr1188429vss.61.1638995325152; Wed, 08 Dec 2021 12:28:45 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id j192sm2536286vkc.39.2021.12.08.12.28.44 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Dec 2021 12:28:44 -0800 (PST) From: Philip McGrath Date: Wed, 8 Dec 2021 15:28:00 -0500 Message-Id: <20211208202838.752542-6-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211208202838.752542-1-philip@philipmcgrath.com> References: <46a042bc08eb72a068b1e8c69bfe28cf2d4b2e53.camel@gmail.com> <20211208202838.752542-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638995372; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xz8xodiZFPQ+SAaK+8rKtLk3kisnKoUJYuaQkixgSGM=; b=DctgC9L3cNV27HVUA3A5X1zMVWmjs6b/cV1dmK7GMQo76bz1vcFrqwJIrTxpGDb9hLksLn XPkkdlVJT4qF9Y+w5YK59N9M9yw8Vintpw+32tcjx9m+sFuF+IytNFXTNhPcMzTv+H9fXK 3RzfDNYIl/uTIq/3xVcaVA/DUklLtuFUblpo+9kJG9cpgoPBLLyGH3q4Znkdp1D4BQQgux 26ERsIgVk+SidjiZ9kcJnxzzBnqGOo9S4LBUdRjB6TYvnzRcD+1IEwYixbrAtqSFzgZL+7 32DfRsyqhpYJkIqRjMdWwU+ziVrhi75ubw7f9omFpxHUqlkajenQ39/VifwYJw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638995372; a=rsa-sha256; cv=none; b=Htomfk7R+1XMhe/Wsz85hpS8+LEOhRG3W4dbX5jxFK2dRFGscnb1EQ3XpmcXIWe0p/g460 6axVaLxGQuGUy6QkYkoR+g3O4Q77U+dRpdnMQ/USmtQDARnpIkJXsKAOUGQUWzBX8tpltb B7uVDxLTIwTmRkI6VaIGJZMGMTeYn3qUOX030iqWovFACtQfO9BTNM3hv+Go+yqZNZcsDZ V6Estv767QkdbqGmcAe+Ji1VN7+C1dMyZkvgk0U7wcxwy9RS5/Wz0ys8ABEk6JOuVKWMHC YUX0lEyKhQGdH36W1QelIIfJuIt3IJ23nv9VEPqRH5BanagONtVYPoYHlNyz8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=KZdkxNOz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=KZdkxNOz; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: C7C6B261CC X-Spam-Score: -0.45 X-Migadu-Scanner: scn1.migadu.com X-TUID: BXqRqWwA5dca * guix/build/node-build-system.scm (patch-dependencies): Strictly follow the linearity rules for `assoc-set!` and friends. Clarify the types of the arguments to and return value from the internal helper function `resolve-dependencies`. --- guix/build/node-build-system.scm | 53 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..6fade54670 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -73,26 +73,45 @@ (define* (patch-dependencies #:key inputs #:allow-other-keys) (define index (index-modules (map cdr inputs))) - (define (resolve-dependencies package-meta meta-key) - (fold (lambda (key+value acc) - (match key+value - ('@ acc) - ((key . value) (acons key (hash-ref index key value) acc)))) - '() - (or (assoc-ref package-meta meta-key) '()))) + (define (resolve-dependencies meta-alist meta-key) + ;; Given: + ;; - The alist from "package.json", with the '@ unwrapped + ;; - A string key, like "dependencies" + ;; Returns: an alist (without a wrapping '@) like the entry in + ;; meta-alist for meta-key, but with dependencies supplied + ;; by Guix packages mapped to the absolute store paths to use. + (match (assoc-ref meta-alist meta-key) + (#f + '()) + (('@ . orig-deps) + (fold (match-lambda* + (((key . value) acc) + (acons key (hash-ref index key value) acc))) + '() + orig-deps)))) (with-atomic-file-replacement "package.json" (lambda (in out) - (let ((package-meta (read-json in))) - (assoc-set! package-meta "dependencies" - (append - '(@) - (resolve-dependencies package-meta "dependencies") - (resolve-dependencies package-meta "peerDependencies"))) - (assoc-set! package-meta "devDependencies" - (append - '(@) - (resolve-dependencies package-meta "devDependencies"))) + ;; It is unsafe to rely on 'assoc-set!' to update an + ;; existing assosciation list variable: + ;; see 'info "(guile)Adding or Setting Alist Entries"'. + (let* ((package-meta (read-json in)) + (alist (match package-meta + ((@ . alist) alist))) + (alist + (assoc-set! + alist "dependencies" + (append + '(@) + (resolve-dependencies alist "dependencies") + (resolve-dependencies alist "peerDependencies")))) + (alist + (assoc-set! + alist "devDependencies" + (append + '(@) + (resolve-dependencies alist "devDependencies")))) + (package-meta (cons '@ alist))) (write-json package-meta out)))) #t) -- 2.32.0