chore: continue work on licenses detection

index.js

@@ -3,6 +3,7 @@ import parseExpressions from "spdx-expression-parse";
 
 // Import Internal Dependencies
 import { spdxLicenseIds, licenseNameToId, closestSpdxLicenseID } from "./src/licenses.js";
+import { LicenseDetector } from "./src/licenseDetector.js";
 import {
   checkSpdx, checkEveryTruthy, checkSomeTruthy, createSpdxLink, readLicense
 } from "./src/utils.js";
@@ -36,25 +37,8 @@ export function licenseIdConformance(licenseID) {
 export async function searchSpdxLicenseId(destination) {
   const contentStr = await readLicense(destination);
 
-  for (const [licenseName, license] of licenseNameToId) {
-    const expr = escapeRegExp(licenseName)
-      .split(" ")
-      .join(String.raw`[\s\S\r\n]+`);
-
-    if (new RegExp(expr, "gm").test(contentStr)) {
-      return license.id;
-    }
-  }
-
-  return null;
-}
-
-/**
- * @param {!string} string
- * @returns {string}
- */
-function escapeRegExp(string) {
-  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new LicenseDetector()
+    .detectFromString(contentStr);
 }
 
 function handleLicenseCase(data) {

package.json

@@ -33,6 +33,7 @@
   "types": "index.d.ts",
   "homepage": "https://github.com/NodeSecure/licenses-conformance#readme",
   "dependencies": {
+    "@openally/result": "^1.0.0",
     "fastest-levenshtein": "^1.0.16",
     "spdx-expression-parse": "^3.0.1"
   },

src/licenseDetector.js

@@ -0,0 +1,93 @@
+// Import Internal Dependencies
+import { licenseNameToId } from "./licenses.js";
+
+// CONSTANTS
+const kNumberChar = new Set(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
+const kEnglishSegmenter = new Intl.Segmenter(
+  "en", { granularity: "word" }
+);
+
+export class LicenseDetector {
+  /**
+   * @param {!string} value
+   * @returns {string[]}
+   */
+  static getWordSegments(value) {
+    return Array.from(
+      kEnglishSegmenter.segment(value),
+      ({ segment }) => segment
+    ).filter((word) => word.trim() !== "" && word.length > 1);
+  }
+
+  static getNumericFromString(value) {
+    const maybeNumeric = [...value]
+      .filter((char) => kNumberChar.has(char))
+      .join("");
+
+    return maybeNumeric.trim() === "" ? null : Number(maybeNumeric);
+  }
+
+  static versionRegex(version) {
+    return new RegExp(
+      `version ${version}|v ${version}|v${version}|v-${version}`, "i"
+    );
+  }
+
+  /**
+   * @param {!string} value
+   * @returns {string | null}
+   */
+  detectExceptionalLicenses(value) {
+    if (value.includes("Apple Computer, Inc., All Rights Reserved")) {
+      return "AML";
+    }
+
+    return null;
+  }
+
+  /**
+   * @param {!string} value
+   * @returns {string | null}
+   */
+  detectFromString(licenseStr) {
+    const segmentedLicenseWords = LicenseDetector.getWordSegments(licenseStr);
+
+    for (const license of licenseNameToId.values()) {
+      const expr = escapeRegExp(license.name)
+        .split(" ")
+        .join(String.raw`[\s\S\r\n]+`);
+
+      /** @type {string} */
+      const id = license.id;
+
+      const matchVersion = license.version === null ?
+        () => true :
+        () => LicenseDetector.versionRegex(license.version).test(licenseStr);
+
+      if (new RegExp(expr, "im").test(licenseStr) && matchVersion()) {
+        return id;
+      }
+
+      // const licenseNumericId = LicenseDetector.getNumericFromString(license.id);
+      const separatedId = id.split("-");
+
+      if (
+        licenseStr.includes(id) ||
+        licenseStr.includes(separatedId.join(" ")) ||
+        separatedId.every((word) => segmentedLicenseWords.includes(word))
+      ) {
+        return id;
+      }
+    }
+
+    return this.detectExceptionalLicenses(licenseStr);
+  }
+}
+
+/**
+ * @param {!string} string
+ * @returns {string}
+ */
+function escapeRegExp(string) {
+  return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

src/licenses.js

@@ -12,7 +12,7 @@ const spdx = JSON.parse(
 const kMaximumLicenseDistance = 1;
 const kLevenshteinCache = new Map();
 
-/** @type {Map<string, string>} */
+/** @type {Map<string, any>} */
 const licenseNameToId = new Map();
 const osi = [];
 const fsf = [];
@@ -28,7 +28,13 @@ for (const [licenseName, license] of Object.entries(spdx)) {
   if (license.fsf) {
     fsf.push(license.id);
   }
-  licenseNameToId.set(licenseName, license);
+
+  const [version = null] = /([v]?[0-9]+.[0-9]+)/gm.exec(licenseName) ?? [];
+  licenseNameToId.set(licenseName, {
+    name: version === null ? licenseName : licenseName.replace(version, "").trimEnd(),
+    ...license,
+    version
+  });
 }
 
 const spdxLicenseIds = new Set([

src/utils.js

@@ -39,6 +39,9 @@ export async function readLicense(destination) {
     let lineCount = 0;
 
     for await (const line of handle.readLines()) {
+      if (line.trim() === "") {
+        continue;
+      }
       contentStr += line;
       if (++lineCount === kMaxLicenseLineToRead) {
         break;

tests/fixtures/licenses/BSD-2-Clause

@@ -0,0 +1,17 @@
+The BSD 2-Clause License The following is a BSD 2-Clause license template. To generate your own license, change the values of OWNER, ORGANIZATION and YEAR from their original values as given here, and substitute your own.
+
+Note: see also the BSD-3-Clause license.
+
+This prelude is not part of the license.
+
+= Regents of the University of California = University of California, Berkeley = 1998
+
+In the original BSD license, both occurrences of the phrase "COPYRIGHT HOLDERS AND CONTRIBUTORS" in the disclaimer read "REGENTS AND CONTRIBUTORS".
+
+Here is the license template:
+
+Copyright (c) , All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tests/fixtures/licenses/CC0-1.0

@@ -0,0 +1,29 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+4. Limitations and Disclaimers.
+a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.