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 wAxzOJ/wu2FONAEAgWs5BA (envelope-from ) for ; Fri, 17 Dec 2021 03:06:23 +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 YNMuNJ/wu2EHWAAA1q6Kng (envelope-from ) for ; Fri, 17 Dec 2021 02:06:23 +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 9D0571B617 for ; Fri, 17 Dec 2021 03:06:23 +0100 (CET) Received: from localhost ([::1]:52478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1my2da-0004WH-QG for larch@yhetil.org; Thu, 16 Dec 2021 21:06:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1my2cW-00039s-G8 for guix-patches@gnu.org; Thu, 16 Dec 2021 21:05:17 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1my2cJ-0007YJ-NI for guix-patches@gnu.org; Thu, 16 Dec 2021 21:05:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1my2cJ-00055i-HT for guix-patches@gnu.org; Thu, 16 Dec 2021 21:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v5 06/45] guix: node-build-system: Refactor patch-dependencies phase. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Dec 2021 02:05: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 Cc: Timothy Sample , Pierre Langlois , Jelle Licht , Philip McGrath , Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163970666119376 (code B ref 51838); Fri, 17 Dec 2021 02:05:03 +0000 Received: (at 51838) by debbugs.gnu.org; 17 Dec 2021 02:04:21 +0000 Received: from localhost ([127.0.0.1]:37274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1my2bc-00052N-PB for submit@debbugs.gnu.org; Thu, 16 Dec 2021 21:04:21 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:41944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1my2bZ-00051s-Jo for 51838@debbugs.gnu.org; Thu, 16 Dec 2021 21:04:18 -0500 Received: by mail-qt1-f177.google.com with SMTP id v22so1180471qtx.8 for <51838@debbugs.gnu.org>; Thu, 16 Dec 2021 18:04:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HgDhxkred0qxyTO/DMBSW0NymNIb0O6DOenE65nfmIE=; b=g5e7KSnmlzB5bixd6TPp1mof7Fc7EJaDbVx8wVkPwJ9XbbX+lWc6Ku6SQ+3LuhULlu 7vW4SEAMPC/sugjJg2FyZZi1GVfem+plWSab3tr6VqhSZ8QX70q4Fs+CepfnDXsW2rHe 28QE45VhyvfFKikf72xsQclGc49x6VWPugV6j88D0DdxNbsFN5lQ55d+HtqxOgi9wcDp RBBJB/0OUgP8wYAixroJfZXSbJZwGHZKBmcRy8jqcmTECz0vB4KFPEGsQPl25fLPVUGJ D6KzZNorz4z2hIfihn/J8RrpDlJWXjS4L2LsICzvaeTnCdhOc1fxa4GB9Uz0MHtTozC6 tv2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HgDhxkred0qxyTO/DMBSW0NymNIb0O6DOenE65nfmIE=; b=VYksO5ZpSKjbfCS5vhne/5pzbw3v09SPGq38pAaZmBk79GCdo9AgokRdeGvsdmEtZx kvUlr6HB7hQYadoHsSha5NXrJbXtfgVB/SneA/rZd4IcJUUV86961SOdAOcc+RZu6e9B Ys7STthdQzS/LEFzg1WbQ5hFA9H5AMwpkahcYem3kvPwFTQ1n2jkOXez2v4t3OXCneBf fHz09xXX1RF0wCpQVFNuBuB2/dZBIj0BFp2Y4ke/Oo2A6gv0OTLrfSMRE+aBHAqkobFh NNM/6BixCSi4mD08ENhPDAfn3MAk0js5x9OeQ1Rz37V9AQvZa5L/FUkPFiJZJ0WdmBoa FO6w== X-Gm-Message-State: AOAM5330r8gzOa6QH/ix3dc5Z8HS8nRwuGesHTC0D0uUkMSnH9fHkZ48 6909TuMpvGi82UmR4IGeeMg9DYDD4b41uIWYuNA= X-Google-Smtp-Source: ABdhPJxBpLXJ31rkCLUMNqnYtBesl6PBUeS0iZTgzLbAgIGZb9bhyM06Zn9uFdTvNw0O7+OFIIJesA== X-Received: by 2002:ac8:57cb:: with SMTP id w11mr721947qta.41.1639706652133; Thu, 16 Dec 2021 18:04:12 -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 w10sm5945238qtk.90.2021.12.16.18.04.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Dec 2021 18:04:11 -0800 (PST) From: Philip McGrath Date: Thu, 16 Dec 2021 21:02:46 -0500 Message-Id: <20211217020325.520821-7-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211217020325.520821-1-philip@philipmcgrath.com> References: <20211213060107.129223-1-philip@philipmcgrath.com> <20211217020325.520821-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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639706783; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=HgDhxkred0qxyTO/DMBSW0NymNIb0O6DOenE65nfmIE=; b=pcAkCyHbsOcGhIYR9GVxYxsJhZ64SS/zswB8GXHjvgfRgmchs+FGs43l/x88f50OsZESP9 wY2NQzkmf4IfP9wFWVwx4YW93u3n/c56D2YLVoSkO4yAHjs+FwPNNS0ok75+E96AfWFCx7 OySVEK59diHDUqJpOqo1rNI6pYXZroHFaXHt577xnQllRNc1+l+MMSBu69oB7XEwtOtj3e FXMVws72oEExq4TwkB+zg/KhP+b24CXwJuQ97/bzuxMFVrGG7Q7dspgDu6t4NK6vSXCD94 BKSr7NFMCCWLB8eyNWdBogOzKg3YFuDbmb1tJKY6luGRsLKo8+MGl6647GJXzg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639706783; a=rsa-sha256; cv=none; b=LSlPkip73LDrQGgTdd4pWef2Q8KLCSna7PqAZHtwZ1YRGqJE8lLM6/t9/A8oWVL/q3Nue5 s+eO+W/0+geCydCbAatWKQnWHqfeKKSFCCcumO+yHwEL6CZ5YFWbUpepMD+DtclVr+s3Jy Rh8BTV6VyzzHwQ2vJUvq5o5txtuVfJUNgsHyqGsJqX33BczkU2U1HWDVkeQ09LPvZtcbbp iTsRKRKScccbtG+C40HyBzt+dMBxmZPwcUsrI2ZD1p98ljz8HBkQiTS9CPX2QFrgQGT7Z1 rl3JgEu9lZTZ6ExFZaLd/QotPNvM7G2BoWfwXaPl1B2DKWzdGZj59mRmL4WWkQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=g5e7KSnm; 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.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=g5e7KSnm; 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: 9D0571B617 X-Spam-Score: 0.01 X-Migadu-Scanner: scn0.migadu.com X-TUID: 15WWruLcfDhM * 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 dcaa719f40..b74e593838 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