From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4BNqOM/QjF8AawAA0tVLHw (envelope-from ) for ; Sun, 18 Oct 2020 23:33:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id YLsyNM/QjF/CfgAA1q6Kng (envelope-from ) for ; Sun, 18 Oct 2020 23:33:35 +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 17B939403CA for ; Sun, 18 Oct 2020 23:33:35 +0000 (UTC) Received: from localhost ([::1]:41524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUIBA-0000Pe-9t for larch@yhetil.org; Sun, 18 Oct 2020 19:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUIAg-0000PR-2G for guix-patches@gnu.org; Sun, 18 Oct 2020 19:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUIAf-0004La-PI for guix-patches@gnu.org; Sun, 18 Oct 2020 19:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kUIAf-0002Fn-Mi for guix-patches@gnu.org; Sun, 18 Oct 2020 19:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41219] [PATCH 2/2] guix: Enforce package.json "files" directive. Resent-From: paul Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Oct 2020 23:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41219 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Jelle Licht , 41219@debbugs.gnu.org Received: via spool by 41219-submit@debbugs.gnu.org id=B41219.16030639758651 (code B ref 41219); Sun, 18 Oct 2020 23:33:01 +0000 Received: (at 41219) by debbugs.gnu.org; 18 Oct 2020 23:32:55 +0000 Received: from localhost ([127.0.0.1]:39363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUIAY-0002FR-Vt for submit@debbugs.gnu.org; Sun, 18 Oct 2020 19:32:55 -0400 Received: from latitanza.investici.org ([82.94.249.234]:57951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUIAX-0002FI-9b for 41219@debbugs.gnu.org; Sun, 18 Oct 2020 19:32:54 -0400 Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4CDx5H5lCTz8sgs; Sun, 18 Oct 2020 23:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1603063971; bh=NJ86GEcA71tvlIWEVXS/D/tZCKoOIa79w3Emwy4UItM=; h=Subject:To:References:From:Date:In-Reply-To:From; b=p8RYCLhpQD6W/8DvmWNPpE+DToxWF7I2JZqctZxreEXAszsPrcXxw6RaznJ8HxkdI dQkYXJ2RQfzpUbyBbvsJXYdBYNtWItMB6u8J5dutLRhfDX3eoPTfQ4Znud1kVrMREC YRvDaZMvBM1Y2RwODUrd6A2ckrJua/cYp4wRjM/M= Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4CDx5H3V2Jz8sgf; Sun, 18 Oct 2020 23:32:51 +0000 (UTC) References: <20200512213131.28873-1-goodoldpaul@autistici.org> <20200512213131.28873-2-goodoldpaul@autistici.org> <875z88jkg9.fsf@jlicht.xyz> <7bea951c-c8c8-cca9-4bfe-8d8f5c83e2ab@autistici.org> <87a6xhel9s.fsf@jlicht.xyz> From: paul Message-ID: Date: Mon, 19 Oct 2020 01:32:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.3.2 MIME-Version: 1.0 In-Reply-To: <87a6xhel9s.fsf@jlicht.xyz> Content-Type: multipart/mixed; boundary="------------2DA8515CEAED3511EC542140" Content-Language: en-US X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=autistici.org header.s=stigmate header.b=p8RYCLhp; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: pBxBj/KDah1N This is a multi-part message in MIME format. --------------2DA8515CEAED3511EC542140 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Dear Jelle, On 9/22/20 8:09 PM, Jelle Licht wrote: > Hey Giacomo, > > paul writes: >>>> + install-dir) >>>> + (begin >>>> + (copy-recursively "." install-dir) >>>> + ;; Remove references to dependencies >>>> + (delete-file-recursively >>>> + (string-append install-dir "/node_modules")))) >>>> + (if (and main >>>> + (not (file-exists? >>>> + (string-append >>>> + install-dir "/" (dirname main))))) > ^ > > {New,Forgotten} nitpick; this only checks for the `dirname': why not > just `(string-append install-dir "/" main)'? Because if > e.g. "lib/utils.js" is in "files", and main is "lib/main.js", it seems > that main would not be installed with this snippet. Does that make > sense? Yes it definitely does. I believe I fixed this in the attached patch. Thank you for your review, Giacomo --------------2DA8515CEAED3511EC542140 Content-Type: text/x-patch; charset=UTF-8; name="0002-guix-Enforce-package.json-files-directive.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0002-guix-Enforce-package.json-files-directive.patch" >From 3cc2a309f611ea1cd7cf1e0274ef81668819e058 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 21 Sep 2020 22:18:19 +0200 Subject: [PATCH 2/2] guix: Enforce package.json "files" directive. This fixes https://issues.guix.gnu.org/40710 by implementing support for the "files" directive from https://docs.npmjs.com/files/package.json#files . * guix/build/node-build-system.scm (install): Enforce package.json "files" directive. * guix/build-system/node.scm (%node-build-system-modules) (node-build)[modules]: Add (guix glob). --- guix/build-system/node.scm | 4 +- guix/build/node-build-system.scm | 68 ++++++++++++++++++++++++++------ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 05c24c47d5..05bc9f2087 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -42,6 +42,7 @@ registry." `((guix build node-build-system) (guix build json) (guix build union) + (guix glob) ,@%gnu-build-system-modules)) ;; TODO: Might be not needed (define (default-node) @@ -90,7 +91,8 @@ registry." (modules '((guix build node-build-system) (guix build json) (guix build union) - (guix build utils)))) + (guix build utils) + (guix glob)))) "Build SOURCE using NODE and INPUTS." (define builder `(begin diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 7799f03595..3c15e7931b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (guix build json) #:use-module (guix build union) #:use-module (guix build utils) + #:use-module (guix glob) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 regex) @@ -110,18 +112,60 @@ the @file{bin} directory." (#f #f))) (dependencies (match (assoc-ref data "dependencies") (('@ deps ...) deps) - (#f #f)))) + (#f #f))) + (file-list (match (assoc-ref data "files") + (() #f) + ((? list? pattern-list) pattern-list) + (#f #f))) + (patterns + (when file-list + (map (lambda (pattern) + (string->compiled-sglob pattern)) + (append file-list + '("package.json" + ;; These files get installed no + ;; matter the case or extension. + "[rR][eE][aA][dD][mM][eE]*" + "[cC][hH][aA][nN][gG][eE][sS]*" + "[cC][hH][aA][nN][gG][eE][lL][oO][gG]*" + "[hH][iI][sS][tT][oO][rR][yY]*" + "[nN][oO][tT][iI][cC][eE]*"))))) + (main (match (assoc-ref data "main") + ("" #f) + ((? string? main-module) main-module) + (#f #f))) + (install-dir (string-append target "/node_modules/" modulename)) + (install-files (lambda (files) + (for-each (lambda (file) + (install-file + file + (string-append install-dir "/" + (dirname file)))) + files)))) (mkdir-p target) - (copy-recursively "." (string-append target "/node_modules/" modulename)) - ;; Remove references to dependencies - (delete-file-recursively - (string-append target "/node_modules/" modulename "/node_modules")) + (if file-list + (install-files + (find-files "." (lambda (file stat) + (any (lambda (pattern) + (glob-match? pattern + (string-drop file 2))) + patterns)))) + (begin + (copy-recursively "." install-dir) + ;; Remove references to dependencies + (delete-file-recursively + (string-append install-dir "/node_modules")))) + (when main + (let ((main.js (if (string-contains (basename main) ".js") + main + (string-append main ".js")))) + (unless (file-exists? main.js) + (install-files (list main.js))))) (cond ((string? binary-configuration) (begin (mkdir-p binaries) - (symlink (string-append target "/node_modules/" modulename "/" - binary-configuration) + (symlink (string-append install-dir "/" binary-configuration) (string-append binaries "/" modulename)))) ((list? binary-configuration) (for-each @@ -130,21 +174,19 @@ the @file{bin} directory." ((key . value) (begin (mkdir-p (dirname (string-append binaries "/" key))) - (symlink (string-append target "/node_modules/" modulename "/" - value) + (symlink (string-append install-dir "/" value) (string-append binaries "/" key)))))) - binary-configuration))) + binary-configuration))) (when dependencies (mkdir-p - (string-append target "/node_modules/" modulename "/node_modules")) + (string-append install-dir "/node_modules")) (for-each (lambda (dependency) (let ((dependency (car dependency))) (symlink (string-append (assoc-ref inputs (string-append "node-" dependency)) "/lib/node_modules/" dependency) - (string-append target "/node_modules/" modulename - "/node_modules/" dependency)))) + (string-append install-dir "/node_modules/" dependency)))) dependencies)) #t)) -- 2.28.0 --------------2DA8515CEAED3511EC542140--